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>
Felipe Contreras committed
Jul 21, 2021 at 17:15 UTC
d3236bececc24d4b8ddc736d278ce0d3d5ff12d6
1 file changed
+1
-1
Documentation/git-pull.txt
+1
-1
@@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the
117
`--preserve-merges` option passed to `git rebase` so that locally created
118
merge commits will not be flattened.
119
+
120
-When false, merge the current branch into the upstream branch.
120
+When false, merge the upstream branch into the current branch.
121
+
122
When `interactive`, enable the interactive mode of rebase.
123
+