| commit | 1c5fa0a179a76f13a6970a281ad876cff44fd8ee | |
| author | Stephan Beyer <s-beyer@gmx.net> | |
| Wed, 16 Jul 2008 01:51:49 +0000 (16 03:51 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Jul 2008 22:13:53 +0000 (16 15:13 -0700) | ||
| tree | df551946fd352860a4618507747597499aa85771 | treesnapshot (tar.gz zip) |
| parent | 01941bd54387aee029315d565f0bc1a5b9c5541a | commitdiff |
rebase-i: keep old parents when preserving merges
When "rebase -i -p" tries to preserve merges of unrelated branches, it
lost some parents:
- When you have more than two parents, the commit in the new history
ends up with fewer than expected number of parents and this breakage
goes unnoticed;
- When you are rebasing a merge with two parents and one is lost, the
command tries to cherry-pick the original merge commit, and the command
fails.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When "rebase -i -p" tries to preserve merges of unrelated branches, it
lost some parents:
- When you have more than two parents, the commit in the new history
ends up with fewer than expected number of parents and this breakage
goes unnoticed;
- When you are rebasing a merge with two parents and one is lost, the
command tries to cherry-pick the original merge commit, and the command
fails.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |