[PATCH 0/6] merge summary and diffstat options cleanup

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Apr 6, 2008, 01:23 UTC
Message-ID: <1207445027-3152-1-git-send-email-szeder@ira.uka.de>
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);

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.

Show 17 quoted lines

>  * 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Ã¡bor (6):
  doc: moved merge.* config variables into separate merge-config.txt
  merge, pull: introduce '--(no-)stat' option
  add 'merge.stat' config variable
  fmt-merge-msg: add '--(no-)log' options and 'merge.log' config
    variable
  merge, pull: add '--(no-)log' command line option
  merge: remove deprecated summary and diffstat options and config
    variables

 Documentation/config.txt               |   32 +----------------------------
 Documentation/git-fmt-merge-msg.txt    |   10 ++++----
 Documentation/git-merge.txt            |   15 +-----------
 Documentation/merge-config.txt         |   35 ++++++++++++++++++++++++++++++++
 Documentation/merge-options.txt        |   15 +++++++++++--
 builtin-fmt-merge-msg.c                |    8 +++---
 contrib/completion/git-completion.bash |    2 +-
 git-merge.sh                           |   18 ++++++++++------
 git-pull.sh                            |   20 +++++++++---------
 t/t6200-fmt-merge-msg.sh               |    6 ++--
 t/t7600-merge.sh                       |   22 ++++++++++++++++---
 11 files changed, 102 insertions(+), 81 deletions(-)
 create mode 100644 Documentation/merge-config.txt