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

Merge branch 'ss/pull-rebase-preserve' into maint 

* ss/pull-rebase-preserve:
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does
  docs: clarify "preserve" option wording for git-pull
maint
Junio C Hamano 2015-03-31 14:54:11 -07:00
parent ab0fb57aac d50d31e880
commit ad00aebfe9
2 changed files with 5 additions and 4 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 was rebased since last fetched, the rebase uses that information
to avoid rebasing non-local changes. to avoid rebasing non-local changes.
+ +
When preserve, also rebase the current branch on top of the upstream When set to preserve, rebase with the `--preserve-merges` option passed
branch, but pass `--preserve-merges` along to `git rebase` so that to `git rebase` so that locally created merge commits will not be flattened.
locally created merge commits will not be flattened.
+ +
When false, merge the current branch into the upstream branch. When false, merge the current branch into the upstream branch.
+ +

4
Documentation/git-rebase.txt
View File

@ -362,7 +362,9 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`.


-p:: -p::
--preserve-merges:: --preserve-merges::
Instead of ignoring merges, try to recreate them. Recreate merge commits instead of flattening the history by replaying
commits a merge commit introduces. Merge conflict resolutions or manual
amendments to merge commits are not preserved.
+ +
This uses the `--interactive` machinery internally, but combining it This uses the `--interactive` machinery internally, but combining it
with the `--interactive` option explicitly is generally not a good with the `--interactive` option explicitly is generally not a good