diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-28 05:42:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-28 13:22:35 -0700 |
| commit | 7948b49ac7be06dd926b5a86e70f7f40f3041899 (patch) | |
| tree | 4869569ea21baabb444ed8eccbf9601311acec58 /Documentation/git-rebase.txt | |
| parent | 7401ab92f8c9c9f7c81763d6f7da8a63a258eff2 (diff) | |
| download | git-7948b49ac7be06dd926b5a86e70f7f40f3041899.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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 |