From 0c783f66df9470ec789825ca3df8fb2922c3c8bd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 28 Aug 2007 21:47:08 -0700 Subject: 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 --- Documentation/git-diff.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 68e65324f..db2eb46a1 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -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] ... [--] [...]:: +'git-diff' [--options] \... [--] [...]:: This form is to view the changes on the branch containing and up to the second , starting at a common ancestor - of both . "git-diff A...B" is equivalent to + of both . "git-diff A\...B" is equivalent to "git-diff $(git-merge-base A B) B". You can omit any one of , 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 in the above description can be -any . +noted that all of the in the above description, except +for the last two forms that use ".." notations, can be any +. For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations (".." and -"...") do not mean a range as defined in the +"\...") do not mean a range as defined in the "SPECIFYING RANGES" section in gitlink:git-rev-parse[1]. OPTIONS -- cgit v1.2.1