Merge branch 'js/reflog-delete'

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index db2eb46a191ecafac09492b95ec6f3a3233dbc6e..57c28628bbfb86b7fa190f7530583fc6ac665d9e 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -21,7 +21,7 @@ tree and the index file, or the index file and the working tree.
        the index (staging area for the next commit).  In other
        words, the differences are what you _could_ tell git to
        further add to the index but you still haven't.  You can
-       stage these changes by using gitlink:git-add[1].
+       stage these changes by using linkgit:git-add[1].
 +
 If exactly two paths are given, and at least one is untracked,
 compare the two files / directories. This behavior can be
@@ -67,14 +67,15 @@ for the last two forms that use ".." notations, can be any
 <tree-ish>.
 
 For a more complete list of ways to spell <commit>, see
-"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 However, "diff" is about comparing two _endpoints_, not ranges,
 and the range notations ("<commit>..<commit>" and
 "<commit>\...<commit>") do not mean a range as defined in the
-"SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
+"SPECIFYING RANGES" section in linkgit:git-rev-parse[1].
 
 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::
@@ -164,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite