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

Why git-merge-resolve in git-am?

From
Shawn Pearce <spearce@spearce.org>
Date
Dec 28, 2006, 01:45 UTC
Message-ID
<20061228014525.GC16612@spearce.org>

Why does git-am use git-merge-resolve while git-rebase -m uses git-merge-recursive?

Can we just change git-am to use git-merge-recursive instead? For one thing its faster, for another it supports the GITHEAD_* feature for naming the hunks in a conflict.

-- 
Shawn.
Next: Junio C Hamano
Message 1 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.