From 4ae048e67e5f0d786b9febc438433d95f18e5937 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 8 Dec 2015 10:36:22 +0100 Subject: git-p4: add option to 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 Helped-by: Pete Harlan Acked-by: Luke Diamand Signed-off-by: Junio C Hamano --- Documentation/git-p4.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation/git-p4.txt') 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:: -- cgit v1.2.3