diff options
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 0 insertions, 4 deletions
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=*|\ |