This config variable has the same effect as the current
'merge.diffstat', but its name is consistent with the related command
line option.
Update documentation and bash completion accordingly.
Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx>
---
Documentation/merge-config.txt | 5 +++++
Documentation/merge-options.txt | 3 ++-
contrib/completion/git-completion.bash | 1 +
git-merge.sh | 1 +
4 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index cc815cc..15efc0d 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,3 +1,8 @@
+merge.stat::
+merge.diffstat::
+ 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.
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index c82bc7e..9c46dcb 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,6 +1,7 @@
--stat, \--summary::
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 (and the
+ equivalent merge.diffstat).
-n, \--no-stat, \--no-summary::
Do not show diffstat at the end of the merge.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5221a1a..4caff8d 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1022,6 +1022,7 @@ _git_config ()
i18n.logOutputEncoding
log.showroot
merge.tool
+ merge.stat
merge.summary
merge.verbosity
pack.window
diff --git a/git-merge.sh b/git-merge.sh
index cda78de..a29a7ec 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
--
1.5.5.76.g546c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
