Re: [PATCH] log,diff-tree: add --combined-with-paths options for merges with renames

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 28, 2019, 00:19 UTC
Message-ID: <xmqqd0oheirf.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BFaVwwM17Oe+-RoP5wt2V58AD=dr01uNPuV=9r4yoF3Qg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 5 quoted lines

> ... Instead, I decided that
> instead of having a "from" and a "to" header, we would have N "from"
> headers (since all parents are what we came from) and 1 "to" header.
> I hope that makes sense, because otherwise I think this become to
> unwieldy of a change.

Yeah, it makes sense for an N-way merge to have N 'from' pathnames that resulted in a single 'to' pathname in the resulting tree.

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