From: Junio C Hamano <gitster@pobox.com>
To: Adam Simpkins <adam@adamsimpkins.net>
Cc: git@vger.kernel.org
Subject: Re: bug in "git log --graph" at the tail end?
Date: Fri, 23 May 2008 18:39:42 -0700 [thread overview]
Message-ID: <7vk5hkpjj5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080524010555.GA5385@adamsimpkins.net> (Adam Simpkins's message of "Fri, 23 May 2008 18:05:56 -0700")
Adam Simpkins <adam@adamsimpkins.net> writes:
> - Merge commits that have uninteresting parents print branch lines for
> all of their parents, even the uninteresting ones.
>
> This is just a cosmetic issue, but I agree it looks bad. Perhaps the
> best thing to do is not to display anything for the uninteresting
> parents. It might look a little confusing to some users though, since
> you can have a merge commit that is printed as 'M', but it only has
> one parent displayed in the graph.
Ah, I was also going to suggest you _not_ to use 'M' at all. In other
words, I do not see anything wrong if you drew the graph like this:
* 1af8bca... Merge branch 'maint'
/|
| * 008442f... Merge branch 'maint-1.5.4' into maint
| * e77b0b5... git-am: fix typo in usage message
| * 74190d2... doc/git-daemon: s/uploadarchive/uploadarch/
next prev parent reply other threads:[~2008-05-24 1:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-23 20:42 bug in "git log --graph" at the tail end? Junio C Hamano
2008-05-23 21:02 ` Reece Dunn
2008-05-24 1:05 ` Adam Simpkins
2008-05-24 1:39 ` Junio C Hamano [this message]
2008-05-24 2:24 ` [PATCH 0/2] fix "log --graph" issues with uninteresting parents Adam Simpkins
2008-05-24 2:24 ` [PATCH 1/2] graph API: fix graph mis-alignment after uninteresting commits Adam Simpkins
2008-05-24 2:24 ` [PATCH 2/2] graph API: don't print branch lines for uninteresting merge parents Adam Simpkins
2008-05-24 18:25 ` Teemu Likonen
2008-05-24 20:52 ` [PATCH 0/1] graph API: always print 'M' for merge commits Adam Simpkins
2008-05-24 20:52 ` [PATCH 1/1] " Adam Simpkins
2008-05-24 22:21 ` Adam Simpkins
2008-05-25 1:28 ` [PATCH 0/1] " Junio C Hamano
2008-05-25 6:29 ` Teemu Likonen
2008-05-25 6:49 ` Adam Simpkins
2008-05-24 22:21 ` [PATCH 2/2] graph API: don't print branch lines for uninteresting merge parents 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=7vk5hkpjj5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--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).