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

Re: Meaning of double + and - in Gitk's diff pane

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 21, 2011, 19:37 UTC
Message-ID
<7vr5a0p8n1.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4D879B25.9090300@dirk.my1.cc>
Dirk Süsserott <newsletter@dirk.my1.cc> writes:
Show 5 quoted lines
> I regularly use gitk to get an overview. Great tool.
> But sometimes it shows me in the diff pane lines preceeded
> with two + or - signs or they are colored in blue or black
> or printed in bold. I think this is true for merge commits
> with conflicts.
Look at the bottom summary of this message for a brief summary:
  http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15527

If you want to know more about how the multi-way diff is condensed, you would find this message from Linus in the same thread illuminating:

  http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15600

(Ignore the bottom part where Linus complains about gitk output---the old implementation in gitk has gone long time ago).

And also this one, again from Linus:
  http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15491
Previous: Dirk SüsserottNext: Dirk Süsserott
Message 2 of 6 in “Meaning of double + and - in Gitk's diff pane”
  1. Dirk SüsserottMar 21, 2011
  2. Junio C HamanoMar 21, 2011
  3. Dirk SüsserottMar 21, 2011
  4. Junio C HamanoMar 21, 2011
  5. Dirk SüsserottMar 21, 2011
  6. Junio C HamanoMar 21, 2011

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.