undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase docs: recommend -r over -p

Browse Source 
The `--preserve-merges` option is now deprecated in favor of
`--rebase-merges`; Let's stop recommending the former.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2019-05-28 05:42:16 -07:00 committed by Junio C Hamano
parent 7401ab92f8
commit 7948b49ac7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-rebase.txt
View File

@ -670,7 +670,8 @@ $ git rebase -i HEAD~5
And move the first patch to the end of the list.
You might want to preserve merges, if you have a history like this:
You might want to recreate merge commits, e.g. if you have a history
like this:
------------------
X
@ -684,7 +685,7 @@ Suppose you want to rebase the side branch starting at "A" to "Q". Make
sure that the current HEAD is "B", and call
-----------------------------
$ git rebase -i -p --onto Q O
$ git rebase -i -r --onto Q O
-----------------------------
Reordering and editing commits usually creates untested intermediate