Code

Merge branch 'jn/cherry-pick-strategy-option' into jch
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:00 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:00 +0000 (19:03 -0800)
* jn/cherry-pick-strategy-option:
  cherry-pick/revert: add support for -X/--strategy-option

1  2 
t/t3032-merge-recursive-options.sh

Simple merge