git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Dirk Süsserott" <newsletter@dirk.my1.cc>
To: Git Mailing List <git@vger.kernel.org>
Subject: Meaning of double + and - in Gitk's diff pane
Date: Mon, 21 Mar 2011 19:38:29 +0100	[thread overview]
Message-ID: <4D879B25.9090300@dirk.my1.cc> (raw)

Hello,

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.

The simple red - and green + lines are obvious, but is
anywhere documented what exactly the other fonts and colors
mean? I tried to "Ask The Audience" (which is Google), but
try searching for plus and minus! It's pointless.

Dirk

             reply	other threads:[~2011-03-21 18:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-21 18:38 Dirk Süsserott [this message]
2011-03-21 19:37 ` Meaning of double + and - in Gitk's diff pane Junio C Hamano
2011-03-21 19:45   ` Dirk Süsserott
2011-03-21 19:49     ` Junio C Hamano
2011-03-21 19:57       ` Dirk Süsserott
2011-03-21 20:40         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D879B25.9090300@dirk.my1.cc \
    --to=newsletter@dirk.my1.cc \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).