Browse Source

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>
maint
Felipe Contreras 4 years ago committed by Junio C Hamano
parent
commit
d3236becec
  1. 2
      Documentation/git-pull.txt

2
Documentation/git-pull.txt

@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the @@ -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.
+

Loading…
Cancel
Save