Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/cherry-pick-root-with-resolve'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 20 May 2011 03:37:19 +0000
(20:37 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 20 May 2011 03:37:19 +0000
(20:37 -0700)
* jk/cherry-pick-root-with-resolve:
t3503: test cherry picking and reverting root commits
revert: allow reverting a root commit
cherry-pick: handle root commits with external strategies
1
2
builtin/merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
e2e4aed
e9fe74c
)
diff --cc
builtin/merge.c
Simple merge