Code

Merge branch 'jn/cherry-pick-strategy-option' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (14:25 -0800)
* jn/cherry-pick-strategy-option:
  cherry-pick/revert: add support for -X/--strategy-option


Trivial merge