Merge branch 'jn/cherry-pick-strategy-option' into next
commit3ccc5908aa6d3b77351475f8fc1aaf1a08ce3bd5
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (5 14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 22:25:05 +0000 (5 14:25 -0800)
treee39dc0ed37ab76983660b1e2985cc194250be7cc
parent20542eda5bf24be5a3db8372259239c34e147bb8
parent67ac1e1d57e45899a4dfd900a0249f48507584b5
Merge branch 'jn/cherry-pick-strategy-option' into next

* jn/cherry-pick-strategy-option:
  cherry-pick/revert: add support for -X/--strategy-option