From: Michael J Gruber <git@drmicha.warpmail.net>
To: Jari Aalto <jari.aalto@cante.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] git-cherry.txt: Change symbol marks in graph.
Date: Thu, 02 Dec 2010 16:26:16 +0100 [thread overview]
Message-ID: <4CF7BA98.8030803@drmicha.warpmail.net> (raw)
In-Reply-To: <8762vcs6in.fsf_-_@picasso.cante.net>
Jari Aalto venit, vidit, dixit 02.12.2010 13:28:
> 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 (= ... ?).
>
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---
> Documentation/git-cherry.txt | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> Revised:
>
> >> +in the <upstream> branch are prefixed with a equal (=) sign, and those
> >
> > "an equal"
>
>
> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
> index fed115a..f49eded 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 an equal sign (=), and those
> +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
Well, that plus the patch to git-cherry itself which I saw before
without being there .|
Michael
prev parent reply other threads:[~2010-12-02 15:28 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
2010-12-02 12:28 ` [PATCH v2] " Jari Aalto
2010-12-02 15:26 ` Michael J Gruber [this message]
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=4CF7BA98.8030803@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/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.