git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Miklos Vajna <vmiklos@frugalware.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nanako Shiraishi <nanako3@lavabit.com>, git@vger.kernel.org
Subject: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists
Date: Sun, 20 Jul 2008 14:12:48 +0200	[thread overview]
Message-ID: <1216555968-31406-1-git-send-email-vmiklos@frugalware.org> (raw)
In-Reply-To: <20080720192125.6117@nanako3.lavabit.com>

It co-existed with 'recursive' when rewriting it in C, but it no longer
available.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---

On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> wrote:
> -     { "stupid",     0 },

If we are at it, recur is also something unnecessary here.

 builtin-merge.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/builtin-merge.c b/builtin-merge.c
index 129b4e6..beba635 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -50,7 +50,6 @@ 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 },
-- 
1.5.6.2.450.g8d367.dirty

  reply	other threads:[~2008-07-20 12:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-20 10:21 [PATCH] Teach "git-merge" that "stupid" merge strategy no longer exists Nanako Shiraishi
2008-07-20 12:12 ` Miklos Vajna [this message]
2008-07-20 18:33   ` [PATCH] Teach 'git merge' that 'recur' " Junio C Hamano
2008-07-20 18:50     ` Miklos Vajna

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1216555968-31406-1-git-send-email-vmiklos@frugalware.org \
    --to=vmiklos@frugalware.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nanako3@lavabit.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).