X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff.txt;h=2808a5ec44d8a9e911faf4c7d24eb844d69390f2;hb=84ef033832af9e0be886214c70b2006b08630072;hp=db2eb46a191ecafac09492b95ec6f3a3233dbc6e;hpb=7468c297fa88f0035dc719e996b93b1404eee6e3;p=git.git

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index db2eb46a1..2808a5ec4 100644
--- 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
 --------
@@ -125,7 +129,7 @@ $ git diff topic...master  <3>
 +
 <1> Changes between the tips of the topic and the master branches.
 <2> Same as above.
-<3> Changes that occured on the master branch since when the topic
+<3> Changes that occurred on the master branch since when the topic
 branch was started off it.
 
 Limiting the diff output::