Autogenerated HTML docs for v1.7.9.2-262-gba998

1 files changed, 6 insertions, 1 deletions

diff --git a/git-p4.html b/git-p4.html
index 316b9a44e..08e192f1f 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -1271,6 +1271,11 @@ git-p4.skipUserNameCheck
 </p>

 </dd>

 </dl></div>

+<div class="paragraph"><p>git-p4.attemptRCSCleanup:

+    If enabled, <em>git p4 submit</em> 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.</p></div>

 </div>

 <h2 id="_implementation_details">IMPLEMENTATION DETAILS</h2>

 <div class="sectionbody">

@@ -1307,7 +1312,7 @@ Each commit imported by <em>git p4</em> has a line at the end of the log
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-01-29 14:19:30 PDT

+Last updated 2012-02-23 14:45:28 PDT

 </div>

 </div>

 </body>