git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 20, 2008, 18:33 UTC
Message-ID
<7vmykc76dn.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1216555968-31406-1-git-send-email-vmiklos@frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
Show 10 quoted lines
> 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.

Good eyes, both of you. Will roll a die and commit one squashed, creditting one of you at random ;-)

Previous: Miklos VajnaNext: Miklos Vajna
Message 3 of 4 in “Teach "git-merge" that "stupid" merge strategy no longer exists”
  1. Teach "git-merge" that "stupid" merge strategy no longer existsNanako Shiraishi, Jul 20, 2008
  2. Teach 'git merge' that 'recur' merge strategy no longer existsMiklos Vajna, Jul 20, 2008
  3. Junio C HamanoJul 20, 2008
  4. Miklos VajnaJul 20, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.