Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/rebase-i-p'
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
raw
|
combined
(merge:
c66c0cb
4fb1a19
)
Trivial merge