diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-02 15:46:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-02 15:46:23 -0700 |
| commit | 9a9436daade6c6669cf99e610278683a2f85112c (patch) | |
| tree | d8a502586c06e384ec3891b95a9df7d745a7f913 /git-pull.html | |
| parent | 20cf493fa70faeee54b449ba267598e3b3982edb (diff) | |
| download | git-htmldocs-9a9436daade6c6669cf99e610278683a2f85112c.tar.gz | |
Autogenerated HTML docs for v2.33.0-rc0
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html index 1ce7ecc25..e7d3c0077 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1134,7 +1134,7 @@ the local merge commits are included in the rebase (see <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 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.<name>.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
@@ -2263,7 +2263,7 @@ version.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-29 16:59:10 PDT
+ 2021-08-02 15:41:53 PDT
</div>
</div>
</body>
|