git-svn: info --url [path]

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

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 68e65324f87a691be9459957796761ff45898564..2808a5ec44d8a9e911faf4c7d24eb844d69390f2 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -53,27 +53,29 @@ forced by --no-index.
        one side is omitted, it will have the same effect as
        using HEAD instead.
 
        one side is omitted, it will have the same effect as
        using HEAD instead.
 

-'git-diff' [--options] <commit>...<commit> [--] [<path>...]::
+'git-diff' [--options] <commit>\...<commit> [--] [<path>...]::

 
        This form is to view the changes on the branch containing
        and up to the second <commit>, starting at a common ancestor
 
        This form is to view the changes on the branch containing
        and up to the second <commit>, starting at a common ancestor

-       of both <commit>.  "git-diff A...B" is equivalent to
+       of both <commit>.  "git-diff A\...B" is equivalent to

        "git-diff $(git-merge-base A B) B".  You can omit any one
        of <commit>, which has the same effect as using HEAD instead.
 
 Just in case if you are doing something exotic, it should be
        "git-diff $(git-merge-base A B) B".  You can omit any one
        of <commit>, which has the same effect as using HEAD instead.
 
 Just in case if you are doing something exotic, it should be

-noted that all of the <commit> in the above description can be
-any <tree-ish>.
+noted that all of the <commit> in the above description, except
+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].
 However, "diff" is about comparing two _endpoints_, not ranges,
 and the range notations ("<commit>..<commit>" and
 
 For a more complete list of ways to spell <commit>, see
 "SPECIFYING REVISIONS" section in gitlink: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
+"<commit>\...<commit>") do not mean a range as defined in the

 "SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
 
 OPTIONS
 -------
 "SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
 
 OPTIONS
 -------

+:git-diff: 1

 include::diff-options.txt[]
 
 <path>...::
 include::diff-options.txt[]
 
 <path>...::


@@ -81,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
 --------


@@ -124,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::