From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Feb 2011 00:41:16 +0000 (-0800)
Subject: Merge branch 'jn/cherry-pick-strategy-option'
X-Git-Tag: v1.7.5-rc0~147
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06938a37dca9bb19784c1bd41e90c99a7c8f8e5e;p=git.git

Merge branch 'jn/cherry-pick-strategy-option'

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

06938a37dca9bb19784c1bd41e90c99a7c8f8e5e