git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Adam Simpkins <adam@adamsimpkins.net>, git@vger.kernel.org
Subject: Re: [PATCH] log --graph: draw '>' and '<' with --left-right
Date: Sat, 24 May 2008 22:27:12 -0700	[thread overview]
Message-ID: <7v63t3j6mn.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0805221344360.30431@racer> (Johannes Schindelin's message of "Thu, 22 May 2008 13:47:23 +0100 (BST)")

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> When calling "git log --left-right <branch1>...<branch2>", a single "<" or 
> ">" is shown in front of the commit line, to indicate which branch1 this 
> commit comes from, branch1 or branch2.
>
> However, it is easy to miss in the output of "git log --graph ...", since 
> the graph still has "*" for regular commits and "M" for merge commits.  So 
> imitate gitk, and show the "<" and ">" characters in the graph, too, 
> instead of "*" (or "M").

This certainly makes it more visible which one is left and which one is
right:

    < commit <205ffa9...
    | Author: Gustaf Hendeby <hendeby@isy.liu.se>
    |
    |     Make git add -n and git -u -n output consistent
    |
    < commit <38ed1d8...
    | Author: Junio C Hamano <gitster@pobox.com>
    |
    |     "git-add -n -u" should not add but just report
    ...

than

    * commit <205ffa9...
    | Author: Gustaf Hendeby <hendeby@isy.liu.se>
    |
    |     Make git add -n and git -u -n output consistent
    |
    * commit <38ed1d8...
    | Author: Junio C Hamano <gitster@pobox.com>
    |
    |     "git-add -n -u" should not add but just report
    |
    ...

But is it just me who now finds the original marker redundant and ugly?
IOW, I wonder if it is better to show this:

    < commit 205ffa9...
    | Author: Gustaf Hendeby <hendeby@isy.liu.se>
    |
    |     Make git add -n and git -u -n output consistent
    |
    < commit 38ed1d8...
    | Author: Junio C Hamano <gitster@pobox.com>
    |
    |     "git-add -n -u" should not add but just report
    ...

This is with --pretty=short, --pretty=oneline makes the issue even more
obvious.

Adam?

  parent reply	other threads:[~2008-05-25  5:28 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-22 11:36 [PATCH] log --graph: draw '>' and '<' with --left-right Johannes Schindelin
2008-05-22 12:47 ` Johannes Schindelin
2008-05-22 13:14   ` Sverre Rabbelier
2008-05-25  5:27   ` Junio C Hamano [this message]
2008-05-25  6:43     ` Adam Simpkins
2008-05-25  7:07       ` [PATCH] log and rev-list: don't print extra prefixes already shown in the graph Adam Simpkins

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=7v63t3j6mn.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=adam@adamsimpkins.net \
    --cc=git@vger.kernel.org \
    /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 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).