git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] git-cherry.txt: Change symbol marks in graph.

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Dec 2, 2010, 15:26 UTC
Message-ID
<4CF7BA98.8030803@drmicha.warpmail.net>
In-Reply-To
<8762vcs6in.fsf_-_@picasso.cante.net>
Jari Aalto venit, vidit, dixit 02.12.2010 13:28:
Show 50 quoted lines
> 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
Previous: Jari Aalto
Message 7 of 7 in “git-cherry.txt: Change symbol marks in graph.”
  1. git-cherry.txt: Change symbol marks in graph.jari.aalto@cante.net, Dec 2, 2010
  2. Jakub NarebskiDec 2, 2010
  3. Michael J GruberDec 2, 2010
  4. Junio C HamanoDec 2, 2010
  5. Michael J GruberDec 2, 2010
  6. git-cherry.txt: Change symbol marks in graph.Jari Aalto, Dec 2, 2010
  7. Michael J GruberDec 2, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.