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

Re: Question about git-merge-stupid

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 3, 2008, 23:54 UTC
Message-ID
<7v4p76y154.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.LFD.1.10.0807030947360.18105@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Well, see above. I think there's a reason why -stupid isn't even worth 
> documenting. It might be better off just removed.
It is called stupid for a reason ;-).

It has been sitting there as an example for a long time, and I do not think anybody minds removing it.

Previous: Miklos VajnaNext: Miklos Vajna
Message 4 of 7 in “Question about git-merge-stupid”
  1. Miklos VajnaJul 3, 2008
  2. Linus TorvaldsJul 3, 2008
  3. Remove 'stupid' merge strategy.Miklos Vajna, Jul 3, 2008
  4. Junio C HamanoJul 3, 2008
  5. Miklos VajnaJul 4, 2008
  6. Move 'stupid' merge strategy to contrib.Miklos Vajna, Jul 5, 2008
  7. Move 'stupid' merge strategy to contrib.Miklos Vajna, Jul 5, 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.