Autogenerated HTML docs for v1.7.11.2-249-g31c79

1 files changed, 6 insertions, 5 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 983f8c848..428f65763 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -585,7 +585,7 @@ git-rebase(1) Manual Page
 <div class="verseblock">

 <div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--exec &lt;cmd&gt;] [--onto &lt;newbase&gt;]

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

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

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

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

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

 <div class="verseblock-attribution">

@@ -1078,10 +1078,11 @@ squash/fixup series.</p></div>
 <p>

         Rebase all commits reachable from &lt;branch&gt;, instead of

         limiting them with an &lt;upstream&gt;.  This allows you to rebase

-        the root commit(s) on a branch.  Must be used with --onto, and

+        the root commit(s) on a branch.  When used with --onto, it

         will skip changes already contained in &lt;newbase&gt; (instead of

-        &lt;upstream&gt;).  When used together with --preserve-merges, <em>all</em>

-        root commits will be rewritten to have &lt;newbase&gt; as parent

+        &lt;upstream&gt;) whereas without --onto it will operate on every change.

+        When used together with both --onto and --preserve-merges,

+        <em>all</em> root commits will be rewritten to have &lt;newbase&gt; as parent

         instead.

 </p>

 </dd>

@@ -1703,7 +1704,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-06-28 16:04:22 PDT

+Last updated 2012-07-15 22:27:35 PDT

 </div>

 </div>

 </body>