| commit | f772c34ce09a49eb553240eb672bf0cc2dbcb10a | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Wed, 10 Nov 2010 07:14:26 +0000 (10 08:14 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Nov 2010 17:38:36 +0000 (10 09:38 -0800) | ||
| tree | a6c1aa23c201be19b66621f33ce1f53747e58211 | treesnapshot (tar.gz zip) |
| parent | 60aa9cf8f370b69eb7feaad2e1cbcd04280bc799 | commitdiff |
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>
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>
| git-rebase.sh | diffblobblamehistory |