Autogenerated HTML docs for v2.7.0-193-gd10e2

1 files changed, 3 insertions, 2 deletions

diff --git a/git-pull.html b/git-pull.html
index cf8372de6..ad5a8b10a 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1025,7 +1025,7 @@ option can be used to override --squash.</p></div>
 -r

 </dt>

 <dt class="hdlist1">

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

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

 </dt>

 <dd>

 <p>

@@ -1038,6 +1038,7 @@ option can be used to override --squash.</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>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

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

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-06-24 14:09:45 PDT

+Last updated 2016-01-26 16:20:09 PST

 </div>

 </div>

 </body>