Merge branch 'maint'

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index cc815cc214f3d860dd0f700b7ed3a1af7684f933..9719311b42f1beadeca752888dbd12a05ce511f8 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,4 +1,8 @@
-merge.summary::
+merge.stat::
+       Whether to print the diffstat berween ORIG_HEAD and merge result
+       at the end of the merge.  True by default.
+
+merge.log::
        Whether to include summaries of merged commits in newly created
        merge commit messages. False by default.