Merge branch 'maint'

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 11c4216c4a5c705c6af55b1367cae96b13c20251..2808a5ec44d8a9e911faf4c7d24eb844d69390f2 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -75,6 +75,7 @@ and the range notations ("<commit>..<commit>" and
 
 OPTIONS
 -------
+:git-diff: 1
 include::diff-options.txt[]
 
 <path>...::