Autogenerated HTML docs for v1.7.8-rc4

1 files changed, 17 insertions, 8 deletions

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index e8e9eb891..54b7f1857 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -584,8 +584,9 @@ git-cherry-pick(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="verseblock-content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;

-<em>git cherry-pick</em> --reset

-<em>git cherry-pick</em> --continue</div>

+<em>git cherry-pick</em> --continue

+<em>git cherry-pick</em> --quit

+<em>git cherry-pick</em> --abort</div>

 <div class="verseblock-attribution">

 </div></div>

 </div>

@@ -773,7 +774,17 @@ effect to your index in a row.</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

---reset

+--continue

+</dt>

+<dd>

+<p>

+        Continue the operation in progress using the information in

+        <em>.git/sequencer</em>.  Can be used to continue after resolving

+        conflicts in a failed cherry-pick or revert.

+</p>

+</dd>

+<dt class="hdlist1">

+--quit

 </dt>

 <dd>

 <p>

@@ -783,13 +794,11 @@ effect to your index in a row.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---continue

+--abort

 </dt>

 <dd>

 <p>

-        Continue the operation in progress using the information in

-        <em>.git/sequencer</em>.  Can be used to continue after resolving

-        conflicts in a failed cherry-pick or revert.

+        Cancel the operation and return to the pre-sequence state.

 </p>

 </dd>

 </dl></div>

@@ -915,7 +924,7 @@ context lines.
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PDT

+Last updated 2011-11-30 12:46:15 PDT

 </div>

 </div>

 </body>