diff options
| -rw-r--r-- | Documentation/merge-config.txt | 4 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 2 | ||||
| -rwxr-xr-x | git-merge.sh | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index cc815cc21..6d0a7971c 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -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:: 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 790417264..d4af5e266 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -1,6 +1,6 @@ --stat:: 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:: Do not show diffstat at the end of the merge. 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 |