From ec96224e215f1b2f143524afa339564271c11e12 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 20 Jul 2008 14:12:48 +0200 Subject: [PATCH] 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 Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano --- builtin-merge.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index 129b4e62dd..06b9970306 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -50,11 +50,9 @@ static size_t use_strategies_nr, use_strategies_alloc; static const char *branch; static struct strategy all_strategy[] = { - { "recur", NO_TRIVIAL }, { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, { "octopus", DEFAULT_OCTOPUS }, { "resolve", 0 }, - { "stupid", 0 }, { "ours", NO_FAST_FORWARD | NO_TRIVIAL }, { "subtree", NO_FAST_FORWARD | NO_TRIVIAL }, }; -- 2.11.4.GIT