Andrew's git / gitweb.git / diff
?
Merge branch 'jn/cherry-pick-strategy-option'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (16:41 -0800)
* jn/cherry-pick-strategy-option:
cherry-pick/revert: add support for -X/--strategy-option

1  2 
t/t3032-merge-recursive-options.sh patch | diff1 | diff2 | blob | history
diff --cc t/t3032-merge-recursive-options.sh
Simple merge