diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 11:17:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 11:17:47 -0700 |
| commit | c01eecf936b3fc58968e889f0c1e7ab7340df593 (patch) | |
| tree | dcf6c9920dfcc4ba892021391755631a78fefcb7 /git-rebase.txt | |
| parent | 56d696ee5be4d6ce871726df6e396c76eedcccf0 (diff) | |
| download | git-htmldocs-c01eecf936b3fc58968e889f0c1e7ab7340df593.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc2
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index f5e6ae390..5e4e92764 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -675,7 +675,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 @@ -689,7 +690,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 |