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)
commit68813771a4e4d24ea2822cb6377f792e0c4705b2
tree1221cbc11b867cff6c24738d743420ed86669144
parent7ed863a85a6ce2c4ac4476848310b8f917ab41f9
parent67ac1e1d57e45899a4dfd900a0249f48507584b5
Merge branch 'jn/cherry-pick-strategy-option' into jch

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