X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=56f1d8d69d05bb4aa26d0dad6e576332588090e8;hb=96cbd573d48297d0f8e5b1f509bc4dd7e9604fa7;hp=182cef54be5963ff0f32a24329ca195607413e29;hpb=7d0c68871a86df0654454df047458836afa13129;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 182cef54b..56f1d8d69 100644
--- 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.