From: Michael J Gruber <git@drmicha•warpmail.net>
To: jari.aalto@cante•net
Cc: git@vger•kernel.org
Subject: Re: [PATCH] git-cherry.txt: Change symbol marks in graph.
Date: Thu, 02 Dec 2010 09:09:31 +0100 [thread overview]
Message-ID: <4CF7543B.6060900@drmicha.warpmail.net> (raw)
In-Reply-To: <1291267093-29855-1-git-send-email-jari.aalto@cante.net>
jari.aalto@cante•net venit, vidit, dixit 02.12.2010 06:18:
> From: Jari Aalto <jari.aalto@cante•net>
You don't need this line if it coincides with the mail header's From.
> 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
I assume you mean "(= ... ?)" etc. Or is "*" supposed to mean "[=-+]"?
"git cherry" does not output "*".
> similar signs (* ... +).
Very good. After not having used cherry in a while, I always have to
look up what "+" and "-" mean. "=" and "?" are self explaining. "=" and
"+" would be also, but you're making a good point for "?". Also, often
those additional commits are not really additional but applied with
minor path-id-changing edits.
>
> Signed-off-by: Jari Aalto <jari.aalto@cante•net>
> ---
> Documentation/git-cherry.txt | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
> index fed115a..f342582 100644
> --- a/Documentation/git-cherry.txt
> +++ b/Documentation/git-cherry.txt
> @@ -19,13 +19,13 @@ the 'git patch-id' program.
> Every commit that doesn't exist in the <upstream> branch
> has its id (sha1) reported, prefixed by a symbol. The ones that have
> equivalent change already
> -in the <upstream> branch are prefixed with a minus (-) sign, and those
> -that only exist in the <head> branch are prefixed with a plus (+) symbol:
> +in the <upstream> branch are prefixed with a equal (=) sign, and those
"an equal"
> +that only exist in the <head> branch are prefixed with a question mark (?) symbol:
>
> - __*__*__*__*__> <upstream>
> + _*__*__*__*__> <upstream>
> /
> fork-point
> - \__+__+__-__+__+__-__+__> <head>
> + \__?__?__=__?__?__=__?__> <head>
>
>
> If a <limit> has been given then the commits along the <head> branch up
> @@ -34,7 +34,7 @@ to and including <limit> are not reported:
> __*__*__*__*__> <upstream>
> /
> fork-point
> - \__*__*__<limit>__-__+__> <head>
> + \__*__*__<limit>__=__?__> <head>
>
>
> Because 'git cherry' compares the changeset rather than the commit id
Other than the above
Acked-by: Michael J Gruber <git@drmicha•warpmail.net>
next prev parent reply other threads:[~2010-12-02 8:11 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
2010-12-02 8:09 ` Michael J Gruber [this message]
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=4CF7543B.6060900@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=jari.aalto@cante$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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