| commit | 0e66f8722c18194665084e85180bd9f3276f3960 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 May 2011 16:37:41 +0000 (26 09:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 May 2011 16:37:41 +0000 (26 09:37 -0700) | ||
| tree | 8891513fc81ecf6bb5bb1f99e38fb6a621c30853 | treesnapshot (tar.gz zip) |
| parent | 93446aa760041a5a6f55605d94cdfad7bcd5a2f1 | commitdiff |
| parent | e9fe74cba4ed4577dcc02f61094c611a1c216fee | commitdiff |
Merge branch 'jk/cherry-pick-root-with-resolve' into maint
* 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 |