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

Puzzled by gitk patch representation for merge commits

From
JLJerome Lovy <t2a2e9z8ncbs9qg@brefemail.com>
Date
Jul 4, 2008, 09:14 UTC
Message-ID
<g4kpmu$9ga$1@ger.gmane.org>
Hello,

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 '-'
But I just don't see what is the respective semantics of these hints...
(I'm using git 1.5.5.1 if that matters.)

Thanks in advance, Jérôme

Next: Jonathan Nieder
Message 1 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.