fsck: --no-dangling omits "dangling object" information

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 8b92cc0f8d54a819236ab879690708ec486f7a19..3fecefaea258a9f0a72651d59a554ee5b99b6382 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -483,6 +483,11 @@ git-p4.skipUserNameCheck::
        user map, 'git p4' exits.  This option can be used to force
        submission regardless.
 
+git-p4.attemptRCSCleanup:
+    If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
+    ($Header$, etc). These would otherwise cause merge conflicts and prevent
+    the submit going ahead. This option should be considered experimental at
+    present.
 
 IMPLEMENTATION DETAILS
 ----------------------