| commit | 02273fdbd07ddaa13a232db0ae63a720c4a013f0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 4 Nov 2007 08:26:02 +0000 (4 01:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 4 Nov 2007 08:26:02 +0000 (4 01:26 -0700) | ||
| tree | 714a6c735a550296c9edd073129d327feb7c87ce | treesnapshot (tar.gz zip) |
| parent | c8a140fee4e7df83b7eb781e436b88b067f149d1 | commitdiff |
| parent | 6232b3438d127def8cc0612e45422347578c6102 | commitdiff |
Merge branch 'jc/revert-merge'
* jc/revert-merge:
cherry-pick/revert -m: add tests
revert/cherry-pick: work on merge commits as well
Conflicts:
builtin-revert.c
* jc/revert-merge:
cherry-pick/revert -m: add tests
revert/cherry-pick: work on merge commits as well
Conflicts:
builtin-revert.c
| builtin-revert.c | diff1 | diff2 | blobhistory |