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
Miklos Vajna <vmiklos@frugalware.org>
Date
Jul 20, 2008, 18:50 UTC
Message-ID
<20080720185005.GN10347@genesis.frugalware.org>
In-Reply-To
<7vmykc76dn.fsf@gitster.siamese.dyndns.org>
On Sun, Jul 20, 2008 at 11:33:24AM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> Good eyes, both of you.  Will roll a die and commit one squashed,
> creditting one of you at random ;-)
I thought commit messages can have multiple Signed-off-by lines. ;-)
Previous: Junio C Hamano
Message 4 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.