Autogenerated HTML docs for v1.7.6-345-g5c2f8

1 files changed, 9 insertions, 5 deletions

diff --git a/git-rebase.html b/git-rebase.html
index a846835d0..8f9b10afc 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -418,10 +418,10 @@ git-rebase(1) Manual Page
 <div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto &lt;newbase&gt;]

         [&lt;upstream&gt;] [&lt;branch&gt;]

 <em>git rebase</em> [-i | --interactive] [options] --onto &lt;newbase&gt;

-        --root [&lt;branch&gt;]</div>

+        --root [&lt;branch&gt;]

+<em>git rebase</em> --continue | --skip | --abort</div>

 <div class="verseblock-attribution">

 </div></div>

-<div class="paragraph"><p><em>git rebase</em> --continue | --skip | --abort</p></div>

 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

@@ -449,7 +449,7 @@ with a different commit message or timestamp will be skipped).</p></div>
 <div class="paragraph"><p>It is possible that a merge failure will prevent this process from being

 completely automatic.  You will have to resolve any such merge failure

 and run <tt>git rebase --continue</tt>.  Another option is to bypass the commit

-that caused the merge failure with <tt>git rebase --skip</tt>.  To restore the

+that caused the merge failure with <tt>git rebase --skip</tt>.  To check out the

 original &lt;branch&gt; and remove the .git/rebase-apply working files, use the

 command <tt>git rebase --abort</tt> instead.</p></div>

 <div class="paragraph"><p>Assume the following history exists and the current branch is "topic":</p></div>

@@ -658,7 +658,11 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
 </dt>

 <dd>

 <p>

-        Restore the original branch and abort the rebase operation.

+        Abort the rebase operation and reset HEAD to the original

+        branch. If &lt;branch&gt; was provided when the rebase operation was

+        started, then HEAD will be reset to &lt;branch&gt;. Otherwise HEAD

+        will be reset to where it was when the rebase operation was

+        started.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1484,7 +1488,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-04-28 22:25:18 UTC

+Last updated 2011-07-23 00:49:30 UTC

 </div>

 </div>

 </body>