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

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

diff --combined t/t3032-merge-recursive-options.sh
index 44f5421be45579b10c5556a958404ad2daa02002,796f616abf17f40e59212b7abb80867f851baa55..2b17311cb0870ea210d9b5cbe167363d13641d67
--- 1/t/t3032-merge-recursive-options.sh
--- 2/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@@ -13,19 -13,16 +13,19 @@@ test_description='merge-recursive optio
  
  . ./test-lib.sh
  
 +test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
 +test_have_prereq MINGW && export GREP_OPTIONS=-U
 +
  test_expect_success 'setup' '
        conflict_hunks () {
 -              sed -n -e "
 -                      /^<<<</ b inconflict
 +              sed $SED_OPTIONS -n -e "
 +                      /^<<<</ b conflict
                        b
 -                      : inconflict
 +                      : conflict
                        p
                        /^>>>>/ b
                        n
 -                      b inconflict
 +                      b conflict
                " "$@"
        } &&
  
@@@ -110,6 -107,20 +110,20 @@@ test_expect_success '--ignore-space-cha
        git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
  '
  
+ test_expect_success 'naive cherry-pick fails' '
+       git read-tree --reset -u HEAD &&
+       test_must_fail git cherry-pick --no-commit remote &&
+       git read-tree --reset -u HEAD &&
+       test_must_fail git cherry-pick remote &&
+       test_must_fail git update-index --refresh &&
+       grep "<<<<<<" text.txt
+ '
+ 
+ test_expect_success '-Xignore-space-change makes cherry-pick succeed' '
+       git read-tree --reset -u HEAD &&
+       git cherry-pick --no-commit -Xignore-space-change remote
+ '
+ 
  test_expect_success '--ignore-space-change: our w/s-only change wins' '
        q_to_cr <<-\EOF >expected &&
            justice and holiness and is the nurse of his age and theQ