From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] disable merge summaries if they are disabled
Date: Wed, 23 May 2007 21:58:23 +0200 [thread overview]
Message-ID: <20070523195823.GA2554@steel.home> (raw)
In-Reply-To: <7vhcq32yda.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Wed, May 23, 2007 20:22:57 +0200:
> "Alex Riesen" <raa.lkml@gmail.com> writes:
>
> > Otherwise the merge.summary option has no visible effect.
>
> I suspect you are mistaking a different merge summary. The
> option affects fmt-merge-msg, iow, the shortlog looking summary
> that appears as the commit message in a merge commit.
>
> The command line parameter --no-summary inhibits the diffstat
> given to the terminal after "git-pull/git-merge" is made.
>
I did it again, didn't I?! :)
next prev parent reply other threads:[~2007-05-23 19:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-23 15:28 [PATCH] disable merge summaries if they are disabled Alex Riesen
2007-05-23 16:03 ` Alex Riesen
2007-05-23 18:22 ` Junio C Hamano
2007-05-23 19:58 ` Alex Riesen [this message]
2007-05-23 20:02 ` [PATCH] Add a configuration option to control diffstat after merge Alex Riesen
2007-05-23 20:18 ` Junio C Hamano
2007-05-23 20:43 ` Alex Riesen
2007-05-23 21:01 ` Alex Riesen
2007-05-23 20:03 ` [PATCH] disable merge summaries if they are disabled Junio C Hamano
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=20070523195823.GA2554@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).