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

Re: Why git-merge-resolve in git-am?

From
Junio C Hamano <junkio@cox.net>
Date
Dec 28, 2006, 02:11 UTC
Message-ID
<7vr6uk3h2p.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20061228014525.GC16612@spearce.org>
Shawn Pearce <spearce@spearce.org> writes:
> Why does git-am use git-merge-resolve while git-rebase -m uses
> git-merge-recursive?

The use of merge-resolve by am predates merge-resolve became usable by at least six weeks, and longer before merge-resolve became really stable for about an extra month after.

Even after it stabilized merge-recursive was way slower than merge-resove until it was rewritten in C for another nine months.

Previous: Shawn PearceNext: Shawn Pearce
Message 2 of 5 in “Why git-merge-resolve in git-am?”
  1. Shawn PearceDec 28, 2006
  2. Junio C HamanoDec 28, 2006
  3. Shawn PearceDec 28, 2006
  4. Junio C HamanoDec 28, 2006
  5. Shawn PearceDec 28, 2006

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.