summaryrefslogtreecommitdiff
path: root/contrib/p4import
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2010-11-10 08:14:26 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-10 09:38:36 -0800
commitf772c34ce09a49eb553240eb672bf0cc2dbcb10a (patch)
treea6c1aa23c201be19b66621f33ce1f53747e58211 /contrib/p4import
parentDocumentation: document show -s (diff)
downloadtgif-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 'contrib/p4import')
0 files changed, 0 insertions, 0 deletions