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

Re: Patchdiff

From
Nicolas Pitre <nico@fluxnic.net>
Date
Jan 27, 2010, 01:40 UTC
Message-ID
<alpine.LFD.2.00.1001262038130.1681@xanadu.home>
In-Reply-To
<7vzl40wcz2.fsf@alter.siamese.dyndns.org>
On Tue, 26 Jan 2010, Junio C Hamano wrote:
Show 6 quoted lines
> When showing a merge, there is one end result (the merged version), so it
> fits the model that is a natural extension of two-way diff.  In the "two
> patches walked in a bar, modified the same version and produced two
> different results" case, the common thing is the preimage, not postimage.
> I couldn't come up with a combined output format that visually makes sense
> for that mode of operation.
Hmmmmmm yeah.  I didn't think it through all the way.  Too bad.
Nicolas
Previous: Junio C HamanoNext: Bert Wesarg
Message 5 of 6 in “Patchdiff”
  1. Sverre RabbelierJan 27, 2010
  2. Jonathan NiederJan 27, 2010
  3. Nicolas PitreJan 27, 2010
  4. Junio C HamanoJan 27, 2010
  5. Nicolas PitreJan 27, 2010
  6. Bert WesargJan 27, 2010

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.