Martin von Zweigbergk f772c34ce0 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>

2010-11-10 09:38:36 -08:00

15 KiB

Executable File

Raw Blame History

View Raw