From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Jari Aalto <jari.aalto@cante.net>, git@vger.kernel.org
Subject: Re: [PATCH] git-cherry.txt: Change symbol marks in graph.
Date: Thu, 02 Dec 2010 09:25:37 -0800 [thread overview]
Message-ID: <7vy688rsry.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <m31v604nc0.fsf@localhost.localdomain> (Jakub Narebski's message of "Thu\, 02 Dec 2010 00\:00\:13 -0800 \(PST\)")
Jakub Narebski <jnareb@gmail.com> writes:
> Jari Aalto <jari.aalto@cante.net> writes:
>
>> From: Jari Aalto <jari.aalto@cante.net>
>>
>> The common commit were marked with a minus sign (-), but that is
>> usually interpreted as something less or substracted. Use natural
>> equal sign (=). Commits that are not in upstream were marked with plus
>> sign (+) but a question mark (?) is visually a litle more striking
>> (erect) in context where all other signs are "flat". It also helps
>> visually impared to see difference between (* ... ?) as opposed to
>> similar signs (* ... +).
>
> Reading comprehension FAIL. The graph in question uses '+' and '-' because
> that is what 'git cherry' *output( uses ('+' included, '-' excluded). They
> are very natural in git-cherry output (diff-like).
Well, cherry's output is not "diff like". '+' is what you need to keep,
as opposed to '-' that marks a commit that needs to be dropped from your
side. If it were "diff like", '+' would have been spelled with a single '
', but then commits on the other side you do not have need be included
with '+' mark. However, 'git cherry' is not trying to produce a diff
between branches; it does not matter what extra stuff the other side
contains.
I however do agree with your conclusion; '=' is not "natural" in the
context of 'git cherry' at all. "You need to drop this" comes more
natural with '-'.
And obviously, the illustration in the documentation uses the same +/-
that appear in the program's output.
So any change along the line of Jari's patch would be a dis-improvement.
next prev parent reply other threads:[~2010-12-02 17:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 5:18 [PATCH] git-cherry.txt: Change symbol marks in graph jari.aalto
2010-12-02 8:00 ` Jakub Narebski
2010-12-02 11:05 ` Michael J Gruber
2010-12-02 17:25 ` Junio C Hamano [this message]
2010-12-02 8:09 ` Michael J Gruber
2010-12-02 12:28 ` [PATCH v2] " Jari Aalto
2010-12-02 15:26 ` Michael J Gruber
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=7vy688rsry.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
--cc=jnareb@gmail.com \
/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).