Autogenerated HTML docs for v1.8.4-273-ga194

1 files changed, 11 insertions, 7 deletions

diff --git a/git-pull.html b/git-pull.html
index 64f632fd5..883c627e8 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1064,16 +1064,20 @@ option can be used to override --squash.</p></div>
 -r

 </dt>

 <dt class="hdlist1">

---rebase

+--rebase[=false|true|preserve]

 </dt>

 <dd>

 <p>

-        Rebase the current branch on top of the upstream branch after

-        fetching.  If there is a remote-tracking branch corresponding to

-        the upstream branch and the upstream branch was rebased since last

-        fetched, the rebase uses that information to avoid rebasing

-        non-local changes.

+        When true, rebase the current branch on top of the upstream

+        branch after fetching. If there is a remote-tracking branch

+        corresponding to the upstream branch and the upstream branch

+        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 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

 <code>--rebase</code> instead of merging.</p></div>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-08-20 08:40:27 PDT

+Last updated 2013-09-11 15:57:23 PDT

 </div>

 </div>

 </body>