git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Adam Simpkins <adam@adamsimpkins.net>
Cc: git@vger.kernel.org, Teemu Likonen <tlikonen@iki.fi>
Subject: Re: [PATCH 0/1] graph API: always print 'M' for merge commits
Date: Sat, 24 May 2008 18:28:08 -0700	[thread overview]
Message-ID: <7vabifkw9j.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 1211662321-28846-1-git-send-email-adam@adamsimpkins.net

Adam Simpkins <adam@adamsimpkins.net> writes:

> On Sat, May 24, 2008 at 09:25:30PM +0300, Teemu Likonen wrote:
>> 
>> I'd rather show merge commits always with M. They are still conceptually
>> merges even if the current log view shows only one parent. This patch
>> changes symbols * and M to be visual symbols, not logical symbols which
>> I'd prefer.
>> 
>> For example user may be interested in finding certain merge but chooses
>> to limit the output with a commit range. It helps if user can always
>> trust the symbols * and M to have this conceptual difference.
>
> Okay.  Here's a simple patch to restore the behavior of always printing
> 'M' for merge commits, even if less than 2 parents are shown in the
> graph.

I have to wonder if that is really necessary.  A merge commit, unless you
amend it, always starts with "Merge ...", and I think it is enough clue of
what the particular commit did.  Besides, I think letter "M" in the
pictorial part of the graph simply looks rather ugly.

I would even suggest not to use 'M' at all, whether its parents are
interesting or not.

  parent reply	other threads:[~2008-05-25  1:29 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
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               ` Junio C Hamano [this message]
2008-05-25  6:29                 ` [PATCH 0/1] " 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=7vabifkw9j.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=adam@adamsimpkins.net \
    --cc=git@vger.kernel.org \
    --cc=tlikonen@iki.fi \
    /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).