diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-02 14:06:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-02 14:06:42 -0700 |
| commit | e9fe413fc29efac6d223cf1bd0cad10231e37df3 (patch) | |
| tree | c49068a8158edbbd95e494393086437c2ec753b1 /Documentation | |
| parent | Merge branch 'ab/bundle-tests' (diff) | |
| parent | doc: pull: fix rebase=false documentation (diff) | |
| download | tgif-e9fe413fc29efac6d223cf1bd0cad10231e37df3.tar.xz | |
Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'
Documentation fix for "git pull --rebase=no".
* fc/pull-no-rebase-merges-theirs-into-ours:
doc: pull: fix rebase=false documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 5c3fb67c01..7f4b2d1982 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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. + |