rebase -i -p: Fix --continue after a merge could not be redone
authorJohannes Sixt <j6t@kdbg.org>
Mon, 15 Dec 2008 10:05:31 +0000 (11:05 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Dec 2008 09:08:51 +0000 (01:08 -0800)
commitf5b49ea...191c2d631d1d70305b25d5db3bf05c92
treef341e3f...1d09639cb194557ffc0a821eef5ae146copy hash to clipboard (tree)
parent03c4829...47e26c844e589c61567a77a77c0658a9copy hash to clipboard (diff)
git-rebase--interactive.sh
t/t3409-rebase-preserve-merges.sh