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>
Martin von Zweigbergk committed
Nov 10, 2010 at 08:14 UTC
f772c34ce09a49eb553240eb672bf0cc2dbcb10a
1 file changed
-4
git-rebase.sh
-4
@@ -311,10 +311,6 @@ do
311
esac
312
strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")"
313
do_merge=t
314
- if test -n "$strategy"
315
- then
316
- strategy=recursive
317
- fi
314
;;
315
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
316
--strateg=*|--strategy=*|\