Merge branch 'maint'

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index ce0f5024687056b696fe5e77362a6f01b18dd0bd..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>...::
@@ -82,6 +83,9 @@ include::diff-options.txt[]
        the diff to the named paths (you can give directory
        names and get diff for all files under them).
 
+Output format
+-------------
+include::diff-format.txt[]
 
 EXAMPLES
 --------