Autogenerated HTML docs for v2.22.0-rc2

1 files changed, 4 insertions, 3 deletions

diff --git a/git-rebase.html b/git-rebase.html
index ebbe9ebc7..9d4cb4f88 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -2052,7 +2052,8 @@ was HEAD~4 becomes the new HEAD. To achieve that, you would call
 <pre><code>$ git rebase -i HEAD~5</code></pre>

 </div></div>

 <div class="paragraph"><p>And move the first patch to the end of the list.</p></div>

-<div class="paragraph"><p>You might want to preserve merges, if you have a history like this:</p></div>

+<div class="paragraph"><p>You might want to recreate merge commits, e.g. if you have a history

+like this:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>           X

@@ -2065,7 +2066,7 @@ was HEAD~4 becomes the new HEAD. To achieve that, you would call
 sure that the current HEAD is "B", and call</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>$ git rebase -i -p --onto Q O</code></pre>

+<pre><code>$ git rebase -i -r --onto Q O</code></pre>

 </div></div>

 <div class="paragraph"><p>Reordering and editing commits usually creates untested intermediate

 steps.  You may want to check that your history editing did not break

@@ -2460,7 +2461,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2019-04-16 21:48:13 JST

+ 2019-05-30 11:14:50 PDT

 </div>

 </div>

 </body>