diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2021-07-21 17:15:45 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-21 16:34:06 -0700 |
| commit | d3236bececc24d4b8ddc736d278ce0d3d5ff12d6 (patch) | |
| tree | 24801c0b833d1c3f0cf83478c0fbcfe98c50e663 /Documentation/git-pull.txt | |
| parent | Git 2.32 (diff) | |
| download | tgif-d3236bececc24d4b8ddc736d278ce0d3d5ff12d6.tar.xz | |
doc: pull: fix rebase=false documentation
"git pull --rebase=false" means we merge their history into ours, but
it has been described the other way around.
Cc: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
[jc: updated the log message]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
| -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. + |