Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'

gitster · gitster · commit e9fe413fc29e · 2021-08-02T14:06:42.000-07:00
Documentation fix for "git pull --rebase=no".

* fc/pull-no-rebase-merges-theirs-into-ours:
  doc: pull: fix rebase=false documentation
diff --git 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.
 +

Original file line number	Diff line number	Diff line change
@@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the
`117`	`117`	`--preserve-merges` option passed to `git rebase` so that locally created
`118`	`118`	`merge commits will not be flattened.`
`119`	`119`	`+`
`120`		`-When false, merge the current branch into the upstream branch.`
	`120`	`+When false, merge the upstream branch into the current branch.`
`121`	`121`	`+`
`122`	`122`	When `interactive`, enable the interactive mode of rebase.
`123`	`123`	`+`