From: Johannes Schindelin Date: Tue, 28 May 2019 12:42:16 +0000 (-0700) Subject: rebase docs: recommend `-r` over `-p` X-Git-Tag: v2.22.0-rc2~6^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7948b49ac7be06dd926b5a86e70f7f40f3041899 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 63047375b6..274870fed4 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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