mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ss/pull-rebase-preserve'
* ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull
This commit is contained in:
commit
3a183520b2
|
@ -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.
|
||||
+
|
||||
|
|
Loading…
Reference in a new issue