X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=10a238ae3cc942bc021db18195b7098e2866c266;hb=13a4899886958c211b96bced228fdaaa42674491;hp=e5df23bb8350d6d155bdf1ac9a5be4c9fdc29326;hpb=7ebee44167fc25b975f5543472c851ab1840af1b;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index e5df23bb8..10a238ae3 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=*|\