From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Wed, 10 Nov 2010 07:14:26 +0000 (+0100)
Subject: rebase -X: do not clobber strategy
X-Git-Tag: v1.7.3.3~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f772c34ce09a49eb553240eb672bf0cc2dbcb10a?ds=inline;hp=--cc

rebase -X: do not clobber strategy

If any strategy options are passed to -X, the strategy will always be
set to 'recursive'. According to the documentation, it should default to
'recursive' if it is not set, but it should be possible to set it to
other values.

This fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

f772c34ce09a49eb553240eb672bf0cc2dbcb10a
diff --git a/git-rebase.sh b/git-rebase.sh
index e5df23bb83..10a238ae3c 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -311,10 +311,6 @@ do
 		esac
 		strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")"
 		do_merge=t
-		if test -n "$strategy"
-		then
-			strategy=recursive
-		fi
 		;;
 	-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
 		--strateg=*|--strategy=*|\