summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-07-20 14:12:48 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-20 11:34:06 -0700
commitec96224e215f1b2f143524afa339564271c11e12 (patch)
tree7ae4c861e6347e3251885b00500a47c0fce1e17a /builtin-merge.c
parentb0f2ecf5935335ba72f406bfc88634142c5694cd (diff)
downloadgit-ec96224e215f1b2f143524afa339564271c11e12.tar.gz
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>
Diffstat (limited to 'builtin-merge.c')
-rw-r--r--builtin-merge.c2
1 files changed, 0 insertions, 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 },
};