From: Adam Simpkins <adam@adamsimpkins.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Teemu Likonen <tlikonen@iki.fi>,
Adam Simpkins <adam@adamsimpkins.net>
Subject: [PATCH 0/1] graph API: always print 'M' for merge commits
Date: Sat, 24 May 2008 13:52:00 -0700 [thread overview]
Message-ID: <1211662321-28846-1-git-send-email-adam@adamsimpkins.net> (raw)
In-Reply-To: <20080524182530.GB2997@mithlond.arda.local>
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.
Adam Simpkins (1):
graph API: always print 'M' for merge commits
graph.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
next prev parent reply other threads:[~2008-05-24 20:53 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 ` Adam Simpkins [this message]
2008-05-24 20:52 ` [PATCH 1/1] graph API: always print 'M' for merge commits 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=1211662321-28846-1-git-send-email-adam@adamsimpkins.net \
--to=adam@adamsimpkins.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).