diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | 3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 (patch) | |
| tree | e09b26d17a873a63d94e7088dff143a0af14d574 /git-merge.sh | |
| parent | d8abe148bece83f6c3e5ebe6075aef236322ed74 (diff) | |
| download | git-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.gz git-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.xz | |
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-x | git-merge.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 0b1592400..793c01555 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 |