Re: [PATCH v2 00/17] Use merge_recursive() directly in the builtin am

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 6, 2016, 21:26 UTC
Message-ID: <xmqqwpkyqwzh.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <cover.1467717729.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

> This is the second iteration of the long-awaited re-roll of the attempt to
> avoid spawning merge-recursive from the builtin am and use merge_recursive()
> directly instead.

I wanted to queue this in 'pu', but an unfortunate series that changes the convert_to_git() infrastructure has serious conflicts with the changes in this series. I am still unsure if these changes cannot be done without butchering the calling convention of what leads to convert_to_git(), but in the meantime, this cannot yet be merged to 'pu'.

$ 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.