Autogenerated HTML docs for v1.7.12.1-382-gb0576

1 files changed, 44 insertions, 2 deletions

diff --git a/git-p4.html b/git-p4.html
index 76a463683..bb522b8f6 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -753,7 +753,7 @@ privileges in p4, which can be granted using <em>p4 protect</em>.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---verbose

+--verbose, -v

 </dt>

 <dd>

 <p>

@@ -947,6 +947,39 @@ options described above.</p></div>
         to the perforce working directory.

 </p>

 </dd>

+<dt class="hdlist1">

+--dry-run, -n

+</dt>

+<dd>

+<p>

+        Show just what commits would be submitted to p4; do not change

+        state in git or p4.

+</p>

+</dd>

+<dt class="hdlist1">

+--prepare-p4-only

+</dt>

+<dd>

+<p>

+        Apply a commit to the p4 workspace, opening, adding and deleting

+        files in p4 as for a normal submit operation.  Do not issue the

+        final "p4 submit", but instead print a message about how to

+        submit manually or revert.  This option always stops after the

+        first (oldest) commit.  Git tags are not exported to p4.

+</p>

+</dd>

+<dt class="hdlist1">

+--conflict=(ask|skip|quit)

+</dt>

+<dd>

+<p>

+        Conflicts can occur when applying a commit to p4.  When this

+        happens, the default behavior ("ask") is to prompt whether to

+        skip this commit and continue, or quit.  This option can be used

+        to bypass the prompt, causing conflicting commits to be automatically

+        skipped, or to quit trying to apply commits, without prompting.

+</p>

+</dd>

 </dl></div>

 <h3 id="_rebase_options">Rebase options</h3><div style="clear:left"></div>

 <div class="paragraph"><p>These options can be used to modify <em>git p4 rebase</em> behavior.</p></div>

@@ -1338,6 +1371,15 @@ git-p4.labelExportRegexp
         default value is <em>[a-zA-Z0-9_\-.]+$</em>.

 </p>

 </dd>

+<dt class="hdlist1">

+git-p4.conflict

+</dt>

+<dd>

+<p>

+        Specify submit behavior when a conflict with p4 is found, as per

+        --conflict.  The default behavior is <em>ask</em>.

+</p>

+</dd>

 </dl></div>

 </div>

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

@@ -1375,7 +1417,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-07-15 22:27:35 PDT

+Last updated 2012-09-18 15:30:10 PDT

 </div>

 </div>

 </body>