Merge branch 'nd/const-struct-cache-entry'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 87e92d6537a097a172d37b5893dd4c8c092a2368..bbed2cd79c6ebbb95e3b66b5f1ccaa3762d9dfce 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -26,6 +26,11 @@ ifndef::git-format-patch[]
        {git-diff? This is the default.}
 endif::git-format-patch[]
 
+-s::
+--no-patch::
+       Suppress diff output. Useful for commands like `git show` that
+       show the patch by default, or to cancel the effect of `--patch`.
+
 -U<n>::
 --unified=<n>::
        Generate diffs with <n> lines of context instead of