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

Re: Puzzled by gitk patch representation for merge commits

From
Jonathan Nieder <jrnieder@uchicago.edu>
Date
Jul 4, 2008, 17:51 UTC
Message-ID
<Pine.GSO.4.62.0807041240110.19792@harper.uchicago.edu>
In-Reply-To
<g4kpmu$9ga$1@ger.gmane.org>
Hi Jérôme,
Jerome Lovy wrote:
Show 10 quoted lines
> I don't understand the graphical scheme that gitk uses when displaying
> patches for merge commits. I would like to be able to explain this to the
> people I'm trying to evangelize to git, because they are also puzzled when
> they try to check with gitk what a merge has done to a given file.
> 
> I can see that at least three graphical hints seem to be involved:
> - font: regular/bold
> - color: red/blue
> (maybe there are more colors when the commit has more than two parents?)
> - column for displaying the '+' or '-'

All of the information is there in the text; the color and font are just supposed to make it easier to see. As for the diff text itself, I didn't remember what it meant myself, so I looked it up.

It seems the diff format shown is that produced by 'git-diff --cc', which makes a "compact combined diff". It only shows conflicting changes. Each column on the left represents the changes from a different parent.

Hope that helps, Jonathan

Previous: Jerome Lovy
Message 2 of 2 in “Puzzled by gitk patch representation for merge commits”
  1. Jerome LovyJul 4, 2008
  2. Jonathan NiederJul 4, 2008

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.