Merge branch 'maint'

* maint: rebase -X: do not clobber strategy
2010-11-15 11:00:24 -08:00 · 2010-11-15 11:00:24 -08:00 · d6b634fafd
parent f8d186bba7 f772c34ce0
commit d6b634fafd
1 changed files with 0 additions and 4 deletions
--- 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=*|\