undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add 'merge.stat' config variable

Browse Source 
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>
This commit is contained in:
SZEDER Gábor 2008-04-06 03:23:44 +02:00 committed by Junio C Hamano
parent d8abe148be
commit 3e6c0a3fe3
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/merge-config.txt
View File

@ -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:: merge.summary::
Whether to include summaries of merged commits in newly created Whether to include summaries of merged commits in newly created
merge commit messages. False by default. merge commit messages. False by default.

2
Documentation/merge-options.txt
View File

@ -1,6 +1,6 @@
--stat:: --stat::
Show a diffstat at the end of the merge. The diffstat is also 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:: -n, \--no-stat::
Do not show diffstat at the end of the merge. Do not show diffstat at the end of the merge.

1
git-merge.sh
View File

@ -212,6 +212,7 @@ while test $args_left -lt $#; do shift; done
if test -z "$show_diffstat"; then if test -z "$show_diffstat"; then
test "$(git config --bool merge.diffstat)" = false && show_diffstat=false 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 test -z "$show_diffstat" && show_diffstat=t
fi fi