Skip to content

Commit

Permalink
Documentation/git-diff: A..B and A...B cannot take tree-ishes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Aug 29, 2007
1 parent 9d5fc59 commit 0c783f6
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions Documentation/git-diff.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,24 @@ forced by --no-index.
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
Expand Down

0 comments on commit 0c783f6

Please sign in to comment.