kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Documentation fix for "git pull --rebase=no".

* fc/pull-no-rebase-merges-theirs-into-ours:
  doc: pull: fix rebase=false documentation
maint
Junio C Hamano 2021-08-02 14:06:42 -07:00
parent 107687b5af d3236becec
commit e9fe413fc2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-pull.txt
View File

@ -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 `--preserve-merges` option passed to `git rebase` so that locally created
merge commits will not be flattened. 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. When `interactive`, enable the interactive mode of rebase.
+ +