summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d5fc59)
raw | patch | inline | side by side (parent: 9d5fc59)
author | Junio C Hamano <gitster@pobox.com> | |
Wed, 29 Aug 2007 04:47:08 +0000 (21:47 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 29 Aug 2007 04:47:08 +0000 (21:47 -0700) |
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>
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>
Documentation/git-diff.txt | patch | blob | history |
index 68e65324f87a691be9459957796761ff45898564..db2eb46a191ecafac09492b95ec6f3a3233dbc6e 100644 (file)
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
- 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
-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
-"<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