add 'merge.stat' config variable

This variable has the same effect, as 'merge.diffstat'.
Also mention it in the documentation.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index cc815cc214f3d860dd0f700b7ed3a1af7684f933..6d0a7971c2f229b20c121b821731e70897f0b1b2 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,3 +1,7 @@
+merge.stat::
+       Whether to print the diffstat berween ORIG_HEAD and merge result
+       at the end of the merge.  True by default.
+

 merge.summary::
        Whether to include summaries of merged commits in newly created
        merge commit messages. False by default.
 merge.summary::
        Whether to include summaries of merged commits in newly created
        merge commit messages. False by default.

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 79041726447d7bb5d0671c78e0378c53368aa238..d4af5e2664d3e26c9d360a9b8b59fdc7cc878db6 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,6 +1,6 @@
 --stat::
        Show a diffstat at the end of the merge. The diffstat is also
 --stat::
        Show a diffstat at the end of the merge. The diffstat is also

-       controlled by the configuration option merge.diffstat.
+       controlled by the configuration option merge.stat.

 
 -n, \--no-stat::
        Do not show diffstat at the end of the merge.
 
 -n, \--no-stat::
        Do not show diffstat at the end of the merge.

diff --git a/git-merge.sh b/git-merge.sh
index 0b15924006b2307eb70308dcf854c05e7dd05c98..793c015550e26a8107e868ee447665ff227210ab 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -212,6 +212,7 @@ while test $args_left -lt $#; do shift; done
 
 if test -z "$show_diffstat"; then
     test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
 
 if test -z "$show_diffstat"; then
     test "$(git config --bool merge.diffstat)" = false && show_diffstat=false

+    test "$(git config --bool merge.stat)" = false && show_diffstat=false

     test -z "$show_diffstat" && show_diffstat=t
 fi
 
     test -z "$show_diffstat" && show_diffstat=t
 fi