Merge branch 'jn/cherry-pick-strategy-option'
commit06938a37dca9bb19784c1bd41e90c99a7c8f8e5e
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (9 16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:16 +0000 (9 16:41 -0800)
tree25be5b409d7bba815b9e99abc2ccdb4a0230ed2c
parenta8e4a5943a63c8fd4a3a9b70ccf4608bcc973707
parent67ac1e1d57e45899a4dfd900a0249f48507584b5
Merge branch 'jn/cherry-pick-strategy-option'

* jn/cherry-pick-strategy-option:
  cherry-pick/revert: add support for -X/--strategy-option
t/t3032-merge-recursive-options.sh