Re: [PATCH v3 0/9] Add a new --remerge-diff capability to show & log

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 31, 2021, 08:46 UTC
Message-ID: <xmqq35m9maa5.fsf@gitster.g>
In-Reply-To: <pull.1103.v3.git.1640907369.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 9 quoted lines

> Changes since v2 (of the restarted submission):
>
>  * Numerous small improvements suggested by Johannes Altmanninger
>  * Avoid including conflict messages from inner merges (due to example
>    pointed out by Ævar).
>  * Added a "remerge" prefix to all the new diff headers (suggested by Junio
>    in a previous round, but I couldn't come up with a good name before. It
>    suddenly hit me that "remerge" is an obvious prefix to use, and even
>    helps explain what the rest of the line is for.)

That sounds sensible.

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