diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
| commit | a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch) | |
| tree | 0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /Documentation/git-rebase.txt | |
| parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
| parent | Git 2.22-rc2 (diff) | |
| download | tgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
Git 2.22-rc2
...
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 f5e6ae3907..5e4e927647 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 |