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

Implementing git-am -3 with git-apply -3?

From
Paul Tan <pyokagan@gmail.com>
Date
May 26, 2015, 02:49 UTC
Message-ID
<CACRoPnQWAYPsVVP_ycjBgPVSM_Orx7QmJc96zL5ixRuqi=V_eg@mail.gmail.com>
Hi Junio,

I noticed that you implemented a 3-way merge fallback[1] in git-apply that is meant to be similar to git-am's.

I wonder if it is possible to implement the 3-way merge in git-am using git-apply. Are there any issues/deficiencies that I need to be aware of?

So far, I noticed that:
* git-apply does not handle renames in the index.
* It could probably try harder at merging submodules (perhaps by using
merge_submodule()?)
[1] http://thread.gmane.org/gmane.comp.version-control.git/201238

Thanks, Paul

Next: Junio C Hamano
Message 1 of 2 in “Implementing git-am -3 with git-apply -3?”
  1. Paul TanMay 26, 2015
  2. Junio C HamanoMay 26, 2015

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.