From: Felipe Contreras Date: Wed, 21 Jul 2021 22:15:45 +0000 (-0500) Subject: doc: pull: fix rebase=false documentation X-Git-Tag: v2.33.0-rc0~3^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3236bececc24d4b8ddc736d278ce0d3d5ff12d6;p=thirdparty%2Fgit.git 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 Signed-off-by: Felipe Contreras [jc: updated the log message] Signed-off-by: Junio C Hamano --- 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. +