Merge branch 'jk/ident-loosen-getpwuid' into maint

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 82aa5d60736ccc75510c19ddec2da9eb4c5611a8..b3e768ee81084acf447072b448e738671b6401f5 100644 (file)
--- 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::