From: Jeff King <peff@peff.net>
Date: Sun, 06 Apr 2008 13:53:05 GMT
Subject: Re: [PATCH] merge, pull: introduce '--diffstat' option
Message-ID: <20080406135304.GA24269@coredump.intra.peff.net>
In-Reply-To: <7vtzigw2wo.fsf@gitster.siamese.dyndns.org>

On Sat, Apr 05, 2008 at 11:51:51AM -0700, Junio C Hamano wrote:

> I'd favor, in the longer run:
> 
>  * --stat option to mean "show the diffstat between ORIG_HEAD and merge
>    result" (i.e. current --summary);
> 
>  * perhaps a new configuration merge.stat to control the default for the
>    above;
> 
>  * merge.log configuration to mean "add list of one-line log to the merge
>    commit message" (i.e. current merge.summary);
> 
>  * perhaps a --log option to override the config default for each
>    invocation.
> 
>  * deprecate --summary and merge.summary and remove them long after people
>    are used to the above new set.

I'll add a belated "yes I agree" to this. This is what I was trying to
describe earlier in the thread, but for some reason couldn't think of
the obvious name "log" to replace merge.summary. :)

-Peff