diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 11:17:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 11:17:47 -0700 |
| commit | c01eecf936b3fc58968e889f0c1e7ab7340df593 (patch) | |
| tree | dcf6c9920dfcc4ba892021391755631a78fefcb7 /git-pull.html | |
| parent | 56d696ee5be4d6ce871726df6e396c76eedcccf0 (diff) | |
| download | git-htmldocs-c01eecf936b3fc58968e889f0c1e7ab7340df593.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc2
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-pull.html b/git-pull.html index 2062000b3..dd000278b 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1100,8 +1100,9 @@ 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 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 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 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.<name>.rebase</code> and <code>branch.autoSetupRebase</code> in
@@ -2102,7 +2103,7 @@ version.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-06-01 16:13:01 JST
+ 2019-05-30 11:14:50 PDT
</div>
</div>
</body>
|