Merge branch 'tb/avoid-gcc-on-darwin-10-6'

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index c3ff7d0d9b1a62709128c985bcc7e8943756949a..738cfde10c84b606e2d341fc2ff597403d1b987b 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -549,6 +549,10 @@ git-p4.largeFilePush::
        Boolean variable which defines if large files are automatically
        pushed to a server.
 
+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::