X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-p4.txt;h=b7c7929716adbad2e27f2d38b83a3c8f74604a59;hb=30fd3a54256a54e5a6006a203c923e97641fb2c2;hp=ed827902fc540d098fc548e5bb68ab3ab95ffa25;hpb=bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea;p=git.git

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index ed827902f..b7c792971 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -318,6 +318,11 @@ around whitespace.  Of the possible wildcards, git-p4 only handles
 '...', and only when it is at the end of the path.  Git-p4 will complain
 if it encounters an unhandled wildcard.
 
+Bugs in the implementation of overlap mappings exist.  If multiple depot
+paths map through overlays to the same location in the repository,
+git-p4 can choose the wrong one.  This is hard to solve without
+dedicating a client spec just for git-p4.
+
 The name of the client can be given to git-p4 in multiple ways.  The
 variable 'git-p4.client' takes precedence if it exists.  Otherwise,
 normal p4 mechanisms of determining the client are used:  environment
@@ -482,6 +487,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
 ----------------------