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>
SZEDER Gábor committed
Apr 6, 2008 at 03:23 UTC
3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425
3 files changed
+6
-1
Documentation/merge-config.txt
+4
@@ -1,3 +1,7 @@
1
+merge.stat::
2
+ Whether to print the diffstat berween ORIG_HEAD and merge result
3
+ at the end of the merge. True by default.
4
+
5
merge.summary::
6
Whether to include summaries of merged commits in newly created
7
merge commit messages. False by default.
Documentation/merge-options.txt
+1
-1
@@ -1,6 +1,6 @@
1
--stat::
2
Show a diffstat at the end of the merge. The diffstat is also
3
- controlled by the configuration option merge.diffstat.
3
+ controlled by the configuration option merge.stat.
4
5
-n, \--no-stat::
6
Do not show diffstat at the end of the merge.
git-merge.sh
+1
@@ -212,6 +212,7 @@ while test $args_left -lt $#; do shift; done
212
213
if test -z "$show_diffstat"; then
214
test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
215
+ test "$(git config --bool merge.stat)" = false && show_diffstat=false
216
test -z "$show_diffstat" && show_diffstat=t
217
fi
218