Merge branch 'ks/maint-getenv-fix'

diff --git a/git-rebase.sh b/git-rebase.sh
index 988b3d8142c80fc58008025b4301c303502ce1a2..0e9d52a5007ed12a23d52a157a7118a50b7693f8 100755 (executable)
--- 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=*|\