diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2010-11-10 08:14:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-10 09:38:36 -0800 |
| commit | f772c34ce09a49eb553240eb672bf0cc2dbcb10a (patch) | |
| tree | a6c1aa23c201be19b66621f33ce1f53747e58211 /git-rebase.sh | |
| parent | 60aa9cf8f370b69eb7feaad2e1cbcd04280bc799 (diff) | |
| download | git-f772c34ce09a49eb553240eb672bf0cc2dbcb10a.tar.gz git-f772c34ce09a49eb553240eb672bf0cc2dbcb10a.tar.xz | |
rebase -X: do not clobber strategy
If any strategy options are passed to -X, the strategy will always be
set to 'recursive'. According to the documentation, it should default to
'recursive' if it is not set, but it should be possible to set it to
other values.
This fixes a regression introduced in v1.7.3-rc0~67^2 (2010-07-29).
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e5df23bb8..10a238ae3 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=*|\ |