diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2008-07-16 03:51:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-16 15:13:53 -0700 |
| commit | 1c5fa0a179a76f13a6970a281ad876cff44fd8ee (patch) | |
| tree | df551946fd352860a4618507747597499aa85771 /Documentation/.gitignore | |
| parent | t7600-merge: Use test_expect_failure to test option parsing (diff) | |
| download | tgif-1c5fa0a179a76f13a6970a281ad876cff44fd8ee.tar.xz | |
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>
Diffstat (limited to 'Documentation/.gitignore')
0 files changed, 0 insertions, 0 deletions