commit | 768c728e7c706ab8d39e0dbf2aa4d1a465930728 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Dec 24 00:14:14 2008 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Dec 24 00:14:14 2008 -0800 |
tree | a7d70a6b0a276027339339bdd4511f471c700bee | |
parent | c66c0cbc7e55409ac934b7c6e89aa7aafa74ede4 [diff] | |
parent | 4fb1a19d502f4a2ca47bfb75cce605f3447819e6 [diff] |
Merge branch 'js/rebase-i-p' * 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