development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ss/pull-rebase-preserve'

Browse source 
* ss/pull-rebase-preserve:
  docs: clarify "preserve" option wording for git-pull
This commit is contained in:
Junio C Hamano 2015-03-28 09:37:51 -07:00
parent cf98c423b5 129260cbd4
commit 3a183520b2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-pull.txt
View file

@ -111,9 +111,8 @@ include::merge-options.txt[]
was rebased since last fetched, the rebase uses that information
to avoid rebasing non-local changes.
+
When preserve, also rebase the current branch on top of the upstream
branch, but pass `--preserve-merges` along to `git rebase` so that
locally created merge commits will not be flattened.
When set to preserve, 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.
+