git merge documentation: -m is optional

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index da1cc60e970027bec50c484e1db5717ec90eb150..019a39f2bf7253f3938d87a21a5467e37e33a2e0 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -58,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"