git merge documentation: -m is optional

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f12082e134871c37c92a06c68430de2ef2a0413b..019a39f2bf7253f3938d87a21a5467e37e33a2e0 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -19,7 +19,9 @@
 --numstat::
        Similar to \--stat, but shows number of added and
        deleted lines in decimal notation and pathname without
-       abbreviation, to make it more machine friendly.
+       abbreviation, to make it more machine friendly.  For
+       binary files, outputs two `-` instead of saying
+       `0 0`.
 
 --shortstat::
        Output only the last line of the --stat format containing total
@@ -56,6 +58,10 @@
        Turn off rename detection, even when the configuration
        file gives the default to do so.
 
+--check::
+       Warn if changes introduce trailing whitespace
+       or an indent that uses a space before a tab.
+
 --full-index::
        Instead of the first handful characters, show full
        object name of pre- and post-image blob on the "index"