cherry-pick/revert: add support for -X/--strategy-option
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 11 Dec 2010 00:51:44 +0000 (18:51 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 19:27:56 +0000 (11:27 -0800)
commit67ac1e1...57e45899a4dfd900a0249f48507584b5
tree075c436...710ef649485d83a3ba7add0e04aaa4b1copy hash to clipboard (tree)
parent73e7b2e...6c62b3ec345b557acb71a8da4798c70dcopy hash to clipboard (diff)
Documentation/git-cherry-pick.txt
Documentation/git-revert.txt
builtin/merge.c
builtin/revert.c
contrib/examples/git-revert.sh
merge-recursive.h
t/t3032-merge-recursive-options.sh