![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Dec 2008 08:14:14 +0000 (00:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Dec 2008 08:14:14 +0000 (00:14 -0800) |
* js/rebase-i-p:
rebase -i -p: leave a --cc patch when a merge could not be redone
rebase -i -p: Fix --continue after a merge could not be redone
Show a failure of rebase -p if the merge had a conflict
rebase -i -p: leave a --cc patch when a merge could not be redone
rebase -i -p: Fix --continue after a merge could not be redone
Show a failure of rebase -p if the merge had a conflict
Trivial merge