--- This is quite confusing for someone new to git who is not familiar with the vocabulary used with git. I don't think a man page is the right place for riddles :) Additionaly I changed two times 'is' to 'are', I hope this is correct. Documentation/git-diff.txt | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) 83ace740fdf1e064168f8438a6ad863986cf4832 diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 890931c..41d85cf 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -8,24 +8,24 @@ git-diff - Show changes between commits, SYNOPSIS -------- -'git-diff' [ --diff-options ] <ent>{0,2} [<path>...] +'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...] DESCRIPTION ----------- -Show changes between two ents, an ent and the working tree, an -ent and the index file, or the index file and the working tree. +Show changes between two trees, a tree and the working tree, a +tree and the index file, or the index file and the working tree. The combination of what is compared with what is determined by -the number of ents given to the command. +the number of trees given to the command. -* When no <ent> is given, the working tree and the index - file is compared, using `git-diff-files`. +* When no <tree-ish> is given, the working tree and the index + file are compared, using `git-diff-files`. -* When one <ent> is given, the working tree and the named - tree is compared, using `git-diff-index`. The option +* When one <tree-ish> is given, the working tree and the named + tree are compared, using `git-diff-index`. The option `--cached` can be given to compare the index file and the named tree. -* When two <ent>s are given, these two trees are compared +* When two <tree-ish>s are given, these two trees are compared using `git-diff-tree`. OPTIONS -- 1.3.1.g9af0 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Apr 27 23:39:45 2006
This archive was generated by hypermail 2.1.8 : 2006-04-27 23:40:07 EST