Teach 'git merge' that some merge strategies no longer exist
'recur' co-existed with 'recursive' when rewriting it in C, but it no longer available. 'stupid' was also recently removed. "git merge -s confused origin" still includes them in the list of available merge strategies. [jc: this is a squash of two micropatches] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Miklos Vajna committed
Jul 20, 2008 at 14:12 UTC
ec96224e215f1b2f143524afa339564271c11e12
1 file changed
-2
builtin-merge.c
-2
@@ -50,11 +50,9 @@ static size_t use_strategies_nr, use_strategies_alloc;
50
static const char *branch;
51
52
static struct strategy all_strategy[] = {
53
- { "recur", NO_TRIVIAL },
53
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
54
{ "octopus", DEFAULT_OCTOPUS },
55
{ "resolve", 0 },
57
- { "stupid", 0 },
56
{ "ours", NO_FAST_FORWARD | NO_TRIVIAL },
57
{ "subtree", NO_FAST_FORWARD | NO_TRIVIAL },
58
};