Merge branch 'maint' to sync with 1.5.2.1

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 182cef54be5963ff0f32a24329ca195607413e29..56f1d8d69d05bb4aa26d0dad6e576332588090e8 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,7 @@
+--summary::
+       Show a diffstat at the end of the merge. The diffstat is also
+       controlled by the configuration option merge.diffstat.
+
 -n, \--no-summary::
        Do not show diffstat at the end of the merge.