From: Jerome Lovy <t2a2e9z8ncbs9qg@brefemail.com>
To: git@vger.kernel.org
Subject: Puzzled by gitk patch representation for merge commits
Date: Fri, 04 Jul 2008 11:14:20 +0200 [thread overview]
Message-ID: <g4kpmu$9ga$1@ger.gmane.org> (raw)
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 reply other threads:[~2008-07-04 9:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-04 9:14 Jerome Lovy [this message]
2008-07-04 17:51 ` Puzzled by gitk patch representation for merge commits Jonathan Nieder
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='g4kpmu$9ga$1@ger.gmane.org' \
--to=t2a2e9z8ncbs9qg@brefemail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.