summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-04 01:26:02 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-04 01:26:02 -0700
commit02273fdbd07ddaa13a232db0ae63a720c4a013f0 (patch)
tree714a6c735a550296c9edd073129d327feb7c87ce /revision.h
parentc8a140fee4e7df83b7eb781e436b88b067f149d1 (diff)
parent6232b3438d127def8cc0612e45422347578c6102 (diff)
downloadgit-02273fdbd07ddaa13a232db0ae63a720c4a013f0.tar.gz
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
Diffstat (limited to 'revision.h')
0 files changed, 0 insertions, 0 deletions