Autogenerated HTML docs for v2.33.1-711-g9d530

1 files changed, 2 insertions, 5 deletions

diff --git a/git-pull.html b/git-pull.html
index ccbba07f1..889a23d0a 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1134,7 +1134,7 @@ option can be used to override --squash.</p></div>
 -r

 </dt>

 <dt class="hdlist1">

---rebase[=false|true|merges|preserve|interactive]

+--rebase[=false|true|merges|interactive]

 </dt>

 <dd>

 <p>

@@ -1147,9 +1147,6 @@ option can be used to override --squash.</p></div>
 <div class="paragraph"><p>When set to <code>merges</code>, rebase using <code>git rebase --rebase-merges</code> so that

 the local merge commits are included in the rebase (see

 <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>

-<div class="paragraph"><p>When set to <code>preserve</code> (deprecated in favor of <code>merges</code>), rebase with the

-<code>--preserve-merges</code> option passed to <code>git rebase</code> so that locally created

-merge commits will not be flattened.</p></div>

 <div class="paragraph"><p>When false, merge the upstream branch into the current branch.</p></div>

 <div class="paragraph"><p>When <code>interactive</code>, enable the interactive mode of rebase.</p></div>

 <div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.&lt;name&gt;.rebase</code> and <code>branch.autoSetupRebase</code> in

@@ -2302,7 +2299,7 @@ version.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-09-01 16:44:20 PDT

+ 2021-10-18 17:00:13 PDT

 </div>

 </div>

 </body>