@matheusbsbs / matheus-bagliano / commits / 0c783f66df
Fork 0

Documentation/git-diff: A..B and A...B cannot take tree-ishes

As pointed out by Linus, these notations require the endpoints given by the end user to be commits. Clarify. Also, three-dots in AsciiDoc are turned into ellipses unless quoted with bq. Be careful. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Aug 28, 2007 at 21:47 UTC 0c783f66df9470ec789825ca3df8fb2922c3c8bd
1 file changed +6 -5
Documentation/git-diff.txt
+6 -5
@@ -53,23 +53,24 @@ forced by --no-index.
53 one side is omitted, it will have the same effect as
54 using HEAD instead.
55
56 -'git-diff' [--options] <commit>...<commit> [--] [<path>...]::
56 +'git-diff' [--options] <commit>\...<commit> [--] [<path>...]::
57
58 This form is to view the changes on the branch containing
59 and up to the second <commit>, starting at a common ancestor
60 - of both <commit>. "git-diff A...B" is equivalent to
60 + of both <commit>. "git-diff A\...B" is equivalent to
61 "git-diff $(git-merge-base A B) B". You can omit any one
62 of <commit>, which has the same effect as using HEAD instead.
63
64 Just in case if you are doing something exotic, it should be
65 -noted that all of the <commit> in the above description can be
66 -any <tree-ish>.
65 +noted that all of the <commit> in the above description, except
66 +for the last two forms that use ".." notations, can be any
67 +<tree-ish>.
68
69 For a more complete list of ways to spell <commit>, see
70 "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
71 However, "diff" is about comparing two _endpoints_, not ranges,
72 and the range notations ("<commit>..<commit>" and
72 -"<commit>...<commit>") do not mean a range as defined in the
73 +"<commit>\...<commit>") do not mean a range as defined in the
74 "SPECIFYING RANGES" section in gitlink:git-rev-parse[1].
75
76 OPTIONS