Merge branch 'bc/send-email-ssl-die-message-fix' into maint

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index ae4edcccfbc2c862f4a1f77a5d58c348fbee2def..4e617e6979dda86138e14cb93d84016d304de07a 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,6 +45,15 @@ include::pretty-options.txt[]
 include::pretty-formats.txt[]
 
 
+COMMON DIFF OPTIONS
+-------------------
+
+:git-log: 1
+include::diff-options.txt[]
+
+include::diff-generate-patch.txt[]
+
+
 EXAMPLES
 --------