summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-04-06 01:23:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-13 02:28:18 (GMT)
commit3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 (patch)
treee09b26d17a873a63d94e7088dff143a0af14d574 /git-merge.sh
parentd8abe148bece83f6c3e5ebe6075aef236322ed74 (diff)
downloadgit-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.zip
git-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.gz
git-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.bz2
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>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 0b15924..793c015 100755
--- 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
+ test "$(git config --bool merge.stat)" = false && show_diffstat=false
test -z "$show_diffstat" && show_diffstat=t
fi