On Sat, Apr 05, 2008 at 11:51:51AM -0700, Junio C Hamano wrote:
quoted text
> I'd favor, in the longer run:
> 
>  * --stat option to mean "show the diffstat between ORIG_HEAD and merge
>    result" (i.e. current --summary);
I have only looked at the 'merge.diffstat' config variable, and wanted
to make the command line option consistent with it.  But you are right,
'--stat' is better, because it's in sync with other commands as well.

quoted text
>  * 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.  

The first patch is an independent documentation cleanup that could be
merged regardless of the other patches, but the others depend on it.

Patches 2-5 are implementing your first four point.  Patch 4 not only
adds the 'merge.log' config variable, but also adds corresponding
command line options.

Finally, the last patch removes all the deprecated stuff.


SZEDER G