{"thread":{"id":"3976","subject":"[PATCH] change ent to tree in git-diff documentation","startedAt":"2006-04-27T13:38:57Z","lastAt":"2006-04-27T13:38:57Z","messageCount":1,"participants":["Matthias Lederhofer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"19182","messageId":"E1FZ6ht-0000st-TY@moooo.ath.cx","threadId":"3976","inReplyTo":null,"subject":"[PATCH] change ent to tree in git-diff documentation","fromName":"Matthias Lederhofer","fromEmail":"matled@gmx.net","sentAt":"2006-04-27T13:38:57Z","receivedAt":"2006-04-27T13:38:57Z","isPatch":true,"sender":{"key":"matled@gmx.net","avatar":null},"body":"---\nThis is quite confusing for someone new to git who is not familiar\nwith the vocabulary used with git. I don't think a man page is the\nright place for riddles :)\nAdditionaly I changed two times 'is' to 'are', I hope this is correct.\n\n Documentation/git-diff.txt |   18 +++++++++---------\n 1 files changed, 9 insertions(+), 9 deletions(-)\n\n83ace740fdf1e064168f8438a6ad863986cf4832\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 890931c..41d85cf 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -8,24 +8,24 @@ git-diff - Show changes between commits,\n \n SYNOPSIS\n --------\n-'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]\n+'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]\n \n DESCRIPTION\n -----------\n-Show changes between two ents, an ent and the working tree, an\n-ent and the index file, or the index file and the working tree.\n+Show changes between two trees, a tree and the working tree, a\n+tree and the index file, or the index file and the working tree.\n The combination of what is compared with what is determined by\n-the number of ents given to the command.\n+the number of trees given to the command.\n \n-* When no <ent> is given, the working tree and the index\n-  file is compared, using `git-diff-files`.\n+* When no <tree-ish> is given, the working tree and the index\n+  file are compared, using `git-diff-files`.\n \n-* When one <ent> is given, the working tree and the named\n-  tree is compared, using `git-diff-index`.  The option\n+* When one <tree-ish> is given, the working tree and the named\n+  tree are compared, using `git-diff-index`.  The option\n   `--cached` can be given to compare the index file and\n   the named tree.\n \n-* When two <ent>s are given, these two trees are compared\n+* When two <tree-ish>s are given, these two trees are compared\n   using `git-diff-tree`.\n \n OPTIONS\n-- \n1.3.1.g9af0\n"}]}