{"thread":{"id":"4819","subject":"[PATCH] change ent to tree in git-diff documentation","startedAt":"2006-07-09T09:59:39Z","lastAt":"2006-07-09T14:27:56Z","messageCount":3,"participants":["Matthias Lederhofer","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"23467","messageId":"E1FzW4h-00058M-3u@moooo.ath.cx","threadId":"4819","inReplyTo":null,"subject":"[PATCH] change ent to tree in git-diff documentation","fromName":"Matthias Lederhofer","fromEmail":"matled@gmx.net","sentAt":"2006-07-09T09:59:39Z","receivedAt":"2006-07-09T09:59:39Z","isPatch":true,"sender":{"key":"matled@gmx.net","avatar":null},"body":"---\nI've sent this patch a while ago and did not get any feedback, so here\nit is again.\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 ] {0,2} [...]\n+'git-diff' [ --diff-options ] {0,2} [...]\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 is given, the working tree and the index\n- file is compared, using `git-diff-files`.\n+* When no is given, the working tree and the index\n+ file are compared, using `git-diff-files`.\n \n-* When one is given, the working tree and the named\n- tree is compared, using `git-diff-index`. The option\n+* When one 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 s are given, these two trees are compared\n+* When two s are given, these two trees are compared\n using `git-diff-tree`.\n \n OPTIONS\n-- \n1.3.1.g9af0\n\n"},{"id":"23471","messageId":"7v1wsvnkj8.fsf@assigned-by-dhcp.cox.net","threadId":"4819","inReplyTo":"E1FzW4h-00058M-3u@moooo.ath.cx","subject":"Re: [PATCH] change ent to tree in git-diff documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-07-09T10:24:11Z","receivedAt":"2006-07-09T10:24:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthias Lederhofer writes:\n\n> This is quite confusing for someone new to git who is not familiar\n> with the vocabulary used with git. I don't think a man page is the\n> right place for riddles :)\n> Additionaly I changed two times 'is' to 'are', I hope this is correct.\n\nI am not attached to at all, but I do not know if this is\nworth it. I suspect there are many other places you need to fix\nto make things consistent, and I think the first thing that\nshould be touched is glossary.txt.\n\n... goes \"git grep -w ent\", gets quite surprised and comes back ...\n\nOops. I think you are right and I was wrong saying the above\nfour lines. It is only git-diff.txt and glossay entry that\ntalks about .\n\nWhoever coined (I do not remember anymore) do you mind\nthis in addition to Matthias's patch?\n\n-- >8 --\nEradicate \n\nTechnical documentation is not a place for riddles.\n\nSigned-off-by: Junio C Hamano \n\n---\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\nindex 116ddb7..14449ca 100644\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -86,7 +86,7 @@ directory::\n ent::\n \tFavorite synonym to \"tree-ish\" by some total geeks. See\n \t`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth\n-\texplanation.\n+\texplanation. Avoid this term, not to confuse people.\n \n fast forward::\n \tA fast-forward is a special type of merge where you have\n"},{"id":"23478","messageId":"Pine.LNX.4.63.0607091626200.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4819","inReplyTo":"7v1wsvnkj8.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] change ent to tree in git-diff documentation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-09T14:27:56Z","receivedAt":"2006-07-09T14:27:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 9 Jul 2006, Junio C Hamano wrote:\n\n> Whoever coined (I do not remember anymore) do you mind\n> this in addition to Matthias's patch?\n\nAFAIR it was me. It was meant as a geek's joke from the beginning, and I \neven had the pleasure of Linus calling me a total geek.\n\nI do not have any objections against removing it. (AKA Ack.)\n\nCiao,\nDscho\n"}]}