projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c66c0cb 4fb1a19)
Merge branch 'js/rebase-i-p'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Dec 2008 08:14:14 +0000 (00:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Dec 2008 08:14:14 +0000 (00:14 -0800)
commit768c728e7c706ab8d39e0dbf2aa4d1a465930728
treea7d70a6b0a276027339339bdd4511f471c700beetree | snapshot
parentc66c0cbc7e55409ac934b7c6e89aa7aafa74ede4commit | diff
parent4fb1a19d502f4a2ca47bfb75cce605f3447819e6commit | 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
Git—the stupid content tracker