summaryrefslogtreecommitdiff
path: root/run-command.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-10-23 13:33:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-26 23:28:28 -0700
commit7791ecbc62b792b3eaa6d722b6dadcea4d0f322d (patch)
tree08ff76b3a227d4bc0395473ad103e82a00355ea3 /run-command.h
parentMerge branch 'ja/shorthelp' (diff)
downloadtgif-7791ecbc62b792b3eaa6d722b6dadcea4d0f322d.tar.xz
revert/cherry-pick: work on merge commits as well
Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline (iow, what change to reverse). With this patch, cherry-pick and revert learn -m (--mainline) option that lets you specify the parent number (starting from 1) of the mainline, so that you can: git revert -m 1 $merge to reverse the changes introduced by the $merge commit relative to its first parent, and: git cherry-pick -m 2 $merge to replay the changes introduced by the $merge commit relative to its second parent. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.h')
0 files changed, 0 insertions, 0 deletions