Autogenerated HTML docs for v2.33.0-328-g8b7c1

1 files changed, 9 insertions, 5 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 7e01202a8..554e813c9 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -815,9 +815,10 @@ followed by <code>git rebase master</code>. When rebase exits <code>topic</code>
 remain the checked-out branch.</p></div>

 <div class="paragraph"><p>If the upstream branch already contains a change you have made (e.g.,

 because you mailed a patch which was applied upstream), then that commit

-will be skipped. For example, running <code>git rebase master</code> on the

-following history (in which <code>A'</code> and <code>A</code> introduce the same set of changes,

-but have different committer information):</p></div>

+will be skipped and warnings will be issued (if the <code>merge</code> backend is

+used).  For example, running <code>git rebase master</code> on the following

+history (in which <code>A'</code> and <code>A</code> introduce the same set of changes, but

+have different committer information):</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>          A---B---C topic

@@ -1089,7 +1090,10 @@ see the --empty flag.</p></div>
 <div class="paragraph"><p>By default (or if <code>--no-reapply-cherry-picks</code> is given), these commits

 will be automatically dropped.  Because this necessitates reading all

 upstream commits, this can be expensive in repos with a large number

-of upstream commits that need to be read.</p></div>

+of upstream commits that need to be read.  When using the <code>merge</code>

+backend, warnings will be issued for each dropped commit (unless

+<code>--quiet</code> is given). Advice will also be issued unless

+<code>advice.skippedCherryPicks</code> is set to false (see <a href="git-config.html">git-config(1)</a>).</p></div>

 <div class="paragraph"><p><code>--reapply-cherry-picks</code> allows rebase to forgo reading all upstream

 commits, potentially improving performance.</p></div>

 <div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

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

 <div id="footer-text">

 Last updated

- 2021-08-30 16:49:46 PDT

+ 2021-09-10 12:51:28 PDT

 </div>

 </div>

 </body>