Autogenerated HTML docs for v2.24.0-308-g228f5

1 files changed, 4 insertions, 4 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 2abbf7ecc..6846cf719 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1439,8 +1439,8 @@ i.e. commits that would be excluded by <a href="git-log.html">git-log(1)</a>'s
 the <code>rebase-cousins</code> mode is turned on, such commits are instead rebased

 onto <code>&lt;upstream&gt;</code> (or <code>&lt;onto&gt;</code>, if specified).</p></div>

 <div class="paragraph"><p>The <code>--rebase-merges</code> mode is similar in spirit to the deprecated

-<code>--preserve-merges</code>, but in contrast to that option works well in interactive

-rebases: commits can be reordered, inserted and dropped at will.</p></div>

+<code>--preserve-merges</code> but works with interactive rebases,

+where commits can be reordered, inserted and dropped at will.</p></div>

 <div class="paragraph"><p>It is currently only possible to recreate the merge commits using the

 <code>recursive</code> merge strategy; Different merge strategies can be used only via

 explicit <code>exec git merge -s &lt;strategy&gt; [...]</code> commands.</p></div>

@@ -1759,7 +1759,7 @@ ours
 <p>

         This option forces conflicting hunks to be auto-resolved cleanly by

         favoring <em>our</em> version.  Changes from the other tree that do not

-        conflict with our side are reflected to the merge result.

+        conflict with our side are reflected in the merge result.

         For a binary file, the entire contents are taken from our side.

 </p>

 <div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not

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

 <div id="footer-text">

 Last updated

- 2019-09-30 14:04:22 JST

+ 2019-12-01 14:55:34 PST

 </div>

 </div>

 </body>