rebase docs: recommend `-r` over `-p`
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>
Johannes Schindelin committed
May 28, 2019 at 05:42 UTC
7948b49ac7be06dd926b5a86e70f7f40f3041899
1 file changed
+3
-2
Documentation/git-rebase.txt
+3
-2
@@ -670,7 +670,8 @@ $ git rebase -i HEAD~5
670
671
And move the first patch to the end of the list.
672
673
-You might want to preserve merges, if you have a history like this:
673
+You might want to recreate merge commits, e.g. if you have a history
674
+like this:
675
676
------------------
677
X
@@ -684,7 +685,7 @@ Suppose you want to rebase the side branch starting at "A" to "Q". Make
685
sure that the current HEAD is "B", and call
686
687
-----------------------------
687
-$ git rebase -i -p --onto Q O
688
+$ git rebase -i -r --onto Q O
689
-----------------------------
690
691
Reordering and editing commits usually creates untested intermediate