whitespace: fix config.txt description of indent-with-non-tab

[git.git] / Documentation / git-diff.txt

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index db2eb46a191ecafac09492b95ec6f3a3233dbc6e..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
 -------
 
 OPTIONS
 -------

+:git-diff: 1

 include::diff-options.txt[]
 
 <path>...::
 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).
 
        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
 --------
 
 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.
 +
 <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::
 branch was started off it.
 
 Limiting the diff output::