| commit | 6699c959efccc7cb969b87bdf8e0154a0fe9ccc8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:19 +0000 (19 20:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:19 +0000 (19 20:37 -0700) | ||
| tree | 96b536942f08c30e8d5f9f7dc6ec950ddd67f0e3 | treesnapshot (tar.gz zip) |
| parent | e2e4aed5defb2df8dbd523613ff4ef46050abb07 | commitdiff |
| parent | e9fe74cba4ed4577dcc02f61094c611a1c216fee | commitdiff |
Merge branch 'jk/cherry-pick-root-with-resolve'
* 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
* 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
| builtin/merge.c | diff1 | diff2 | blobhistory |