diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-15 11:00:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 11:00:24 -0800 |
| commit | d6b634fafdb5570d9c25d5176d3d32fe0b22530d (patch) | |
| tree | 381c0541692cd85a07a6582f8e1e3c238f7bf230 | |
| parent | f8d186bba72342fed45ed27e89e1bd1179f31545 (diff) | |
| parent | f772c34ce09a49eb553240eb672bf0cc2dbcb10a (diff) | |
| download | git-d6b634fafdb5570d9c25d5176d3d32fe0b22530d.tar.xz | |
Merge branch 'maint'
* maint:
rebase -X: do not clobber strategy
| -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=*|\ |