Merge branch 'maint'

* maint: rebase -X: do not clobber strategy
git-mirror · Nov 15, 2010 · d6b634f · d6b634f
2 parents f8d186b + f772c34
commit d6b634f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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=*|\