Autogenerated HTML docs for v2.4.0-rc0-37-ga3b75

1 files changed, 3 insertions, 4 deletions

diff --git a/git-pull.html b/git-pull.html
index 20eaa0856..2b1a6c7f2 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1037,9 +1037,8 @@ option can be used to override --squash.</p></div>
         was rebased since last fetched, the rebase uses that information

         to avoid rebasing non-local changes.

 </p>

-<div class="paragraph"><p>When preserve, also rebase the current branch on top of the upstream

-branch, but pass <code>--preserve-merges</code> along to <code>git rebase</code> so that

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

+<div class="paragraph"><p>When set to preserve, 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 current branch into the upstream branch.</p></div>

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

 <a href="git-config.html">git-config(1)</a> if you want to make <code>git pull</code> always use

@@ -1848,7 +1847,7 @@ version.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-03-23 14:31:16 PDT

+Last updated 2015-03-28 11:17:28 PDT

 </div>

 </div>

 </body>