summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2015-12-08 10:36:22 +0100
committerJunio C Hamano <gitster@pobox.com>2015-12-10 10:45:02 -0800
commit4ae048e67e5f0d786b9febc438433d95f18e5937 (patch)
treeee9c8f52b855abe106f5f749d4added0f09a5f6a /Documentation
parent120c585b229096595b4e54801a538cbef16c8240 (diff)
downloadgit-4ae048e67e5f0d786b9febc438433d95f18e5937.tar.gz
git-p4: add option to keep empty commitsls/p4-keep-empty-commits
A changelist that contains only excluded files due to a client spec was imported as an empty commit. Fix that issue by ignoring these commits. Add option "git-p4.keepEmptyCommits" to make the previous behavior available. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Pete Harlan Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 82aa5d6073..b3e768ee81 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -510,6 +510,10 @@ git-p4.useClientSpec::
option '--use-client-spec'. See the "CLIENT SPEC" section above.
This variable is a boolean, not the name of a p4 client.
+git-p4.keepEmptyCommits::
+ A changelist that contains only excluded files will be imported
+ as an empty commit if this boolean option is set to true.
+
Submit variables
~~~~~~~~~~~~~~~~
git-p4.detectRenames::