Re: [PATCH] merge, pull: introduce '--diffstat' option

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 5, 2008, 18:51 UTC
Message-ID: <7vtzigw2wo.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200804051835.54097.tlikonen@iki.fi>

Teemu Likonen <tlikonen@iki.fi> writes:

Show 7 quoted lines

> How about this: Officially and explicitly deprecate --(no-)summary and 
> advertise --(no-)diffstat as replacement. Also advertise that in some 
> future release --(no-)summary will have different meaning (i.e. 
> equivalent to merge.summary). There would be a reasonable (?) period 
> before changing the meaning of --(no-)summary.
>
> This is a bit hassle...

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.

Transition needs to happen over time and across a major release bump.

We can do the first four in 1.5.6, and immediately declare deprecation, and removal of --summary/merge.summary perhaps in 1.6.0.