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.txt | |
| parent | 20cf493fa70faeee54b449ba267598e3b3982edb (diff) | |
| download | git-htmldocs-9a9436daade6c6669cf99e610278683a2f85112c.tar.gz | |
Autogenerated HTML docs for v2.33.0-rc0
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index 5c3fb67c0..7f4b2d198 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened. + -When false, merge the current branch into the upstream branch. +When false, merge the upstream branch into the current branch. + When `interactive`, enable the interactive mode of rebase. + |