Merge branch 'jn/cherry-pick-strategy-option' into next
commit1c10f1616bfc43eabab98c733658715b7d90f879
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Feb 2011 22:16:17 +0000 (3 14:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Feb 2011 22:16:17 +0000 (3 14:16 -0800)
tree312f98f7a5a542bd51dba2d28d6f4372a7f4f204
parent597a63054241c122515c93cbce45bc44eb231f18
parent67ac1e1d57e45899a4dfd900a0249f48507584b5
Merge branch 'jn/cherry-pick-strategy-option' into next

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