* [PATCH] git-cherry.txt: Change symbol marks in graph.
@ 2010-12-02 5:18 jari.aalto
2010-12-02 8:00 ` Jakub Narebski
2010-12-02 8:09 ` Michael J Gruber
0 siblings, 2 replies; 7+ messages in thread
From: jari.aalto @ 2010-12-02 5:18 UTC (permalink / raw)
To: git; +Cc: Jari Aalto
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 (* ... +).
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
+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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] git-cherry.txt: Change symbol marks in graph.
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
1 sibling, 2 replies; 7+ messages in thread
From: Jakub Narebski @ 2010-12-02 8:00 UTC (permalink / raw)
To: Jari Aalto; +Cc: git
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).
--
Jakub Narebski
Poland
ShadeHawk on #git
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] git-cherry.txt: Change symbol marks in graph.
2010-12-02 8:00 ` Jakub Narebski
@ 2010-12-02 11:05 ` Michael J Gruber
2010-12-02 17:25 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Michael J Gruber @ 2010-12-02 11:05 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Jari Aalto, git
Jakub Narebski venit, vidit, dixit 02.12.2010 09:00:
> 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).
Yep, and I so wished that git-cherry had different output that I even
saw a git-cherry patch where there was none...
So, +1 from me if this comes with an actual code patch.
Michael
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] git-cherry.txt: Change symbol marks in graph.
2010-12-02 8:00 ` Jakub Narebski
2010-12-02 11:05 ` Michael J Gruber
@ 2010-12-02 17:25 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2010-12-02 17:25 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Jari Aalto, git
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] git-cherry.txt: Change symbol marks in graph.
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 8:09 ` Michael J Gruber
2010-12-02 12:28 ` [PATCH v2] " Jari Aalto
1 sibling, 1 reply; 7+ messages in thread
From: Michael J Gruber @ 2010-12-02 8:09 UTC (permalink / raw)
To: jari.aalto; +Cc: git
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>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] git-cherry.txt: Change symbol marks in graph.
2010-12-02 8:09 ` Michael J Gruber
@ 2010-12-02 12:28 ` Jari Aalto
2010-12-02 15:26 ` Michael J Gruber
0 siblings, 1 reply; 7+ messages in thread
From: Jari Aalto @ 2010-12-02 12:28 UTC (permalink / raw)
To: git
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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2] git-cherry.txt: Change symbol marks in graph.
2010-12-02 12:28 ` [PATCH v2] " Jari Aalto
@ 2010-12-02 15:26 ` Michael J Gruber
0 siblings, 0 replies; 7+ messages in thread
From: Michael J Gruber @ 2010-12-02 15:26 UTC (permalink / raw)
To: Jari Aalto; +Cc: git
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-12-02 17:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).