| commit | 2a63845d0d2a3affb8fec5b43b353f4f3edebe81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:20:10 +0000 (16 17:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:20:10 +0000 (16 17:20 -0700) | ||
| tree | fc84fc4c05e321350cf222b33625b850e3837960 | treesnapshot (tar.gz zip) |
| parent | 5d0b5840c7a794422fa24b014a6cf0b7e7ac9281 | commitdiff |
| parent | e9fe74cba4ed4577dcc02f61094c611a1c216fee | commitdiff |
Merge branch 'jk/cherry-pick-root-with-resolve' into next
* 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 |