{"thread":{"id":"25922","subject":"[PATCH] git-cherry.txt: Change symbol marks in graph.","startedAt":"2010-12-02T05:18:13Z","lastAt":"2010-12-02T17:25:37Z","messageCount":7,"participants":["jari.aalto@cante.net","Jakub Narebski","Michael J Gruber","Jari Aalto","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157076","messageId":"1291267093-29855-1-git-send-email-jari.aalto@cante.net","threadId":"25922","inReplyTo":null,"subject":"[PATCH] git-cherry.txt: Change symbol marks in graph.","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-02T05:18:13Z","receivedAt":"2010-12-02T05:18:13Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\nThe common commit were marked with a minus sign (-), but that is\nusually interpreted as something less or substracted. Use natural\nequal sign (=). Commits that are not in upstream were marked with plus\nsign (+) but a question mark (?) is visually a litle more striking\n(erect) in context where all other signs are \"flat\". It also helps\nvisually impared to see difference between (* ... ?) as opposed to\nsimilar signs (* ... +).\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-cherry.txt |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt\nindex fed115a..f342582 100644\n--- a/Documentation/git-cherry.txt\n+++ b/Documentation/git-cherry.txt\n@@ -19,13 +19,13 @@ the 'git patch-id' program.\n Every commit that doesn't exist in the <upstream> branch\n has its id (sha1) reported, prefixed by a symbol.  The ones that have\n equivalent change already\n-in the <upstream> branch are prefixed with a minus (-) sign, and those\n-that only exist in the <head> branch are prefixed with a plus (+) symbol:\n+in the <upstream> branch are prefixed with a equal (=) sign, and those\n+that only exist in the <head> branch are prefixed with a question mark (?) symbol:\n \n-               __*__*__*__*__> <upstream>\n+               _*__*__*__*__> <upstream>\n               /\n     fork-point\n-              \\__+__+__-__+__+__-__+__> <head>\n+              \\__?__?__=__?__?__=__?__> <head>\n \n \n If a <limit> has been given then the commits along the <head> branch up\n@@ -34,7 +34,7 @@ to and including <limit> are not reported:\n                __*__*__*__*__> <upstream>\n               /\n     fork-point\n-              \\__*__*__<limit>__-__+__> <head>\n+              \\__*__*__<limit>__=__?__> <head>\n \n \n Because 'git cherry' compares the changeset rather than the commit id\n-- \n1.7.2.3\n"},{"id":"157091","messageId":"m31v604nc0.fsf@localhost.localdomain","threadId":"25922","inReplyTo":"1291267093-29855-1-git-send-email-jari.aalto@cante.net","subject":"Re: [PATCH] git-cherry.txt: Change symbol marks in graph.","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-12-02T08:00:13Z","receivedAt":"2010-12-02T08:00:13Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Jari Aalto <jari.aalto@cante.net> writes:\n\n> From: Jari Aalto <jari.aalto@cante.net>\n> \n> The common commit were marked with a minus sign (-), but that is\n> usually interpreted as something less or substracted. Use natural\n> equal sign (=). Commits that are not in upstream were marked with plus\n> sign (+) but a question mark (?) is visually a litle more striking\n> (erect) in context where all other signs are \"flat\". It also helps\n> visually impared to see difference between (* ... ?) as opposed to\n> similar signs (* ... +).\n\nReading comprehension FAIL.  The graph in question uses '+' and '-' because\nthat is what 'git cherry' *output( uses ('+' included, '-' excluded).  They\nare very natural in git-cherry output (diff-like).\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"157092","messageId":"4CF7543B.6060900@drmicha.warpmail.net","threadId":"25922","inReplyTo":"1291267093-29855-1-git-send-email-jari.aalto@cante.net","subject":"Re: [PATCH] git-cherry.txt: Change symbol marks in graph.","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-12-02T08:09:31Z","receivedAt":"2010-12-02T08:09:31Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"jari.aalto@cante.net venit, vidit, dixit 02.12.2010 06:18:\n> From: Jari Aalto <jari.aalto@cante.net>\n\nYou don't need this line if it coincides with the mail header's From.\n\n> The common commit were marked with a minus sign (-), but that is\n> usually interpreted as something less or substracted. Use natural\n> equal sign (=). Commits that are not in upstream were marked with plus\n> sign (+) but a question mark (?) is visually a litle more striking\n> (erect) in context where all other signs are \"flat\". It also helps\n> visually impared to see difference between (* ... ?) as opposed to\n\nI assume you mean \"(= ... ?)\" etc. Or is \"*\" supposed to mean \"[=-+]\"?\n\"git cherry\" does not output \"*\".\n\n> similar signs (* ... +).\n\nVery good. After not having used cherry in a while, I always have to\nlook up what \"+\" and \"-\" mean. \"=\" and \"?\" are self explaining. \"=\" and\n\"+\" would be also, but you're making a good point for \"?\". Also, often\nthose additional commits are not really additional but applied with\nminor path-id-changing edits.\n\n> \n> Signed-off-by: Jari Aalto <jari.aalto@cante.net>\n> ---\n>  Documentation/git-cherry.txt |   10 +++++-----\n>  1 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt\n> index fed115a..f342582 100644\n> --- a/Documentation/git-cherry.txt\n> +++ b/Documentation/git-cherry.txt\n> @@ -19,13 +19,13 @@ the 'git patch-id' program.\n>  Every commit that doesn't exist in the <upstream> branch\n>  has its id (sha1) reported, prefixed by a symbol.  The ones that have\n>  equivalent change already\n> -in the <upstream> branch are prefixed with a minus (-) sign, and those\n> -that only exist in the <head> branch are prefixed with a plus (+) symbol:\n> +in the <upstream> branch are prefixed with a equal (=) sign, and those\n\n\"an equal\"\n\n> +that only exist in the <head> branch are prefixed with a question mark (?) symbol:\n>  \n> -               __*__*__*__*__> <upstream>\n> +               _*__*__*__*__> <upstream>\n>                /\n>      fork-point\n> -              \\__+__+__-__+__+__-__+__> <head>\n> +              \\__?__?__=__?__?__=__?__> <head>\n>  \n>  \n>  If a <limit> has been given then the commits along the <head> branch up\n> @@ -34,7 +34,7 @@ to and including <limit> are not reported:\n>                 __*__*__*__*__> <upstream>\n>                /\n>      fork-point\n> -              \\__*__*__<limit>__-__+__> <head>\n> +              \\__*__*__<limit>__=__?__> <head>\n>  \n>  \n>  Because 'git cherry' compares the changeset rather than the commit id\n\nOther than the above\n\nAcked-by: Michael J Gruber <git@drmicha.warpmail.net>\n"},{"id":"157101","messageId":"4CF77D7D.90507@drmicha.warpmail.net","threadId":"25922","inReplyTo":"m31v604nc0.fsf@localhost.localdomain","subject":"Re: [PATCH] git-cherry.txt: Change symbol marks in graph.","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-12-02T11:05:33Z","receivedAt":"2010-12-02T11:05:33Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jakub Narebski venit, vidit, dixit 02.12.2010 09:00:\n> Jari Aalto <jari.aalto@cante.net> writes:\n> \n>> From: Jari Aalto <jari.aalto@cante.net>\n>>\n>> The common commit were marked with a minus sign (-), but that is\n>> usually interpreted as something less or substracted. Use natural\n>> equal sign (=). Commits that are not in upstream were marked with plus\n>> sign (+) but a question mark (?) is visually a litle more striking\n>> (erect) in context where all other signs are \"flat\". It also helps\n>> visually impared to see difference between (* ... ?) as opposed to\n>> similar signs (* ... +).\n> \n> Reading comprehension FAIL.  The graph in question uses '+' and '-' because\n> that is what 'git cherry' *output( uses ('+' included, '-' excluded).  They\n> are very natural in git-cherry output (diff-like).\n\nYep, and I so wished that git-cherry had different output that I even\nsaw a git-cherry patch where there was none...\n\nSo, +1 from me if this comes with an actual code patch.\n\nMichael\n"},{"id":"157105","messageId":"8762vcs6in.fsf_-_@picasso.cante.net","threadId":"25922","inReplyTo":"4CF7543B.6060900@drmicha.warpmail.net","subject":"[PATCH v2] git-cherry.txt: Change symbol marks in graph.","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-02T12:28:48Z","receivedAt":"2010-12-02T12:28:48Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"The common commit were marked with a minus sign (-), but that is\nusually interpreted as something less or substracted. Use natural\nequal sign (=). Commits that are not in upstream were marked with plus\nsign (+) but a question mark (?) is visually a litle more striking\n(erect) in context where all other signs are \"flat\". It also helps\nvisually impared to see difference between (= ... ?).\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-cherry.txt |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\n    Revised:\n\n    >> +in the <upstream> branch are prefixed with a equal (=) sign, and those\n    >\n    > \"an equal\"\n\n\ndiff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt\nindex fed115a..f49eded 100644\n--- a/Documentation/git-cherry.txt\n+++ b/Documentation/git-cherry.txt\n@@ -19,13 +19,13 @@ the 'git patch-id' program.\n Every commit that doesn't exist in the <upstream> branch\n has its id (sha1) reported, prefixed by a symbol.  The ones that have\n equivalent change already\n-in the <upstream> branch are prefixed with a minus (-) sign, and those\n-that only exist in the <head> branch are prefixed with a plus (+) symbol:\n+in the <upstream> branch are prefixed with an equal sign (=), and those\n+that only exist in the <head> branch are prefixed with a question mark (?) symbol:\n \n-               __*__*__*__*__> <upstream>\n+               _*__*__*__*__> <upstream>\n               /\n     fork-point\n-              \\__+__+__-__+__+__-__+__> <head>\n+              \\__?__?__=__?__?__=__?__> <head>\n \n \n If a <limit> has been given then the commits along the <head> branch up\n@@ -34,7 +34,7 @@ to and including <limit> are not reported:\n                __*__*__*__*__> <upstream>\n               /\n     fork-point\n-              \\__*__*__<limit>__-__+__> <head>\n+              \\__*__*__<limit>__=__?__> <head>\n \n \n Because 'git cherry' compares the changeset rather than the commit id\n-- \n1.7.2.3\n"},{"id":"157118","messageId":"4CF7BA98.8030803@drmicha.warpmail.net","threadId":"25922","inReplyTo":"8762vcs6in.fsf_-_@picasso.cante.net","subject":"Re: [PATCH v2] git-cherry.txt: Change symbol marks in graph.","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-12-02T15:26:16Z","receivedAt":"2010-12-02T15:26:16Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jari Aalto venit, vidit, dixit 02.12.2010 13:28:\n> The common commit were marked with a minus sign (-), but that is\n> usually interpreted as something less or substracted. Use natural\n> equal sign (=). Commits that are not in upstream were marked with plus\n> sign (+) but a question mark (?) is visually a litle more striking\n> (erect) in context where all other signs are \"flat\". It also helps\n> visually impared to see difference between (= ... ?).\n> \n> Signed-off-by: Jari Aalto <jari.aalto@cante.net>\n> ---\n>  Documentation/git-cherry.txt |   10 +++++-----\n>  1 files changed, 5 insertions(+), 5 deletions(-)\n> \n>     Revised:\n> \n>     >> +in the <upstream> branch are prefixed with a equal (=) sign, and those\n>     >\n>     > \"an equal\"\n> \n> \n> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt\n> index fed115a..f49eded 100644\n> --- a/Documentation/git-cherry.txt\n> +++ b/Documentation/git-cherry.txt\n> @@ -19,13 +19,13 @@ the 'git patch-id' program.\n>  Every commit that doesn't exist in the <upstream> branch\n>  has its id (sha1) reported, prefixed by a symbol.  The ones that have\n>  equivalent change already\n> -in the <upstream> branch are prefixed with a minus (-) sign, and those\n> -that only exist in the <head> branch are prefixed with a plus (+) symbol:\n> +in the <upstream> branch are prefixed with an equal sign (=), and those\n> +that only exist in the <head> branch are prefixed with a question mark (?) symbol:\n>  \n> -               __*__*__*__*__> <upstream>\n> +               _*__*__*__*__> <upstream>\n>                /\n>      fork-point\n> -              \\__+__+__-__+__+__-__+__> <head>\n> +              \\__?__?__=__?__?__=__?__> <head>\n>  \n>  \n>  If a <limit> has been given then the commits along the <head> branch up\n> @@ -34,7 +34,7 @@ to and including <limit> are not reported:\n>                 __*__*__*__*__> <upstream>\n>                /\n>      fork-point\n> -              \\__*__*__<limit>__-__+__> <head>\n> +              \\__*__*__<limit>__=__?__> <head>\n>  \n>  \n>  Because 'git cherry' compares the changeset rather than the commit id\n\nWell, that plus the patch to git-cherry itself which I saw before\nwithout being there .|\n\nMichael\n"},{"id":"157120","messageId":"7vy688rsry.fsf@alter.siamese.dyndns.org","threadId":"25922","inReplyTo":"m31v604nc0.fsf@localhost.localdomain","subject":"Re: [PATCH] git-cherry.txt: Change symbol marks in graph.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-12-02T17:25:37Z","receivedAt":"2010-12-02T17:25:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> Jari Aalto <jari.aalto@cante.net> writes:\n>\n>> From: Jari Aalto <jari.aalto@cante.net>\n>> \n>> The common commit were marked with a minus sign (-), but that is\n>> usually interpreted as something less or substracted. Use natural\n>> equal sign (=). Commits that are not in upstream were marked with plus\n>> sign (+) but a question mark (?) is visually a litle more striking\n>> (erect) in context where all other signs are \"flat\". It also helps\n>> visually impared to see difference between (* ... ?) as opposed to\n>> similar signs (* ... +).\n>\n> Reading comprehension FAIL.  The graph in question uses '+' and '-' because\n> that is what 'git cherry' *output( uses ('+' included, '-' excluded).  They\n> are very natural in git-cherry output (diff-like).\n\nWell, cherry's output is not \"diff like\".  '+' is what you need to keep,\nas opposed to '-' that marks a commit that needs to be dropped from your\nside.  If it were \"diff like\", '+' would have been spelled with a single '\n', but then commits on the other side you do not have need be included\nwith '+' mark.  However, 'git cherry' is not trying to produce a diff\nbetween branches; it does not matter what extra stuff the other side\ncontains.\n\nI however do agree with your conclusion; '=' is not \"natural\" in the\ncontext of 'git cherry' at all.  \"You need to drop this\" comes more\nnatural with '-'.\n\nAnd obviously, the illustration in the documentation uses the same +/-\nthat appear in the program's output.\n\nSo any change along the line of Jari's patch would be a dis-improvement.\n"}]}