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

Re: Merge made by recursive?

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
May 25, 2011, 17:42 UTC
Message-ID
<BANLkTikRW+k38sHcokL=FsNmLRNF0+E--w@mail.gmail.com>
In-Reply-To
<loom.20110525T192418-887@post.gmane.org>
Hi Shawn,
Shawn Ligocki writes:
> Is this intentionally bad grammar? Every time I see it, I cringe a little. What
> does it even mean? That it merged incrementally through each subsequent revision?

I suppose it's yet another quirk I've got used to -- "recursive" refers to the merge strategy that was used; see git-merge(1). We can definitely make the Porcelain say something nicer like `merged successfully using "recursive" merge strategy`.

Patches are welcome: see Documentation/SubmittingPatches :)
-- Ram
Previous: Shawn LigockiNext: Jakub Narebski
Message 2 of 10 in “Merge made by recursive?”
  1. Shawn LigockiMay 25, 2011
  2. Ramkumar RamachandraMay 25, 2011
  3. Jakub NarebskiMay 25, 2011
  4. Junio C HamanoMay 25, 2011
  5. Jeff KingMay 25, 2011
  6. Junio C HamanoMay 25, 2011
  7. Junio C HamanoMay 25, 2011
  8. Jeff KingMay 25, 2011
  9. Jeff KingMay 25, 2011
  10. Jeff KingMay 25, 2011

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.