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

gitk: color in the merge diffs

From
SBSanti Béjar <sbejar@gmail.com>
Date
Dec 15, 2005, 15:13 UTC
Message-ID
<87d5jytmv4.fsf@ifae.es>
Hello *,
      In the diff of a merge it is used some colors for the parents, red
      for the first parent, blue for the second, then green, purple,
      brown, and the rest are grey. It would help to remember this code
      if the Parent's line in the comments used the same colors.
Parent: 2db8aaeca1dca4e940829b87d1164e5b42ff49b4 (rebase: ....)
Parent: b3f041fb0f7de167dbb6711b0a231d36c4b5de08 (git-am ...)
        ^^^^ in red the first and blue the second...
      Thanks.
Message 1 of 1 in “gitk: color in the merge diffs”
  1. Santi BéjarDec 15, 2005

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.