# [PATCH] change ent to tree in git-diff documentation 3 messages from 2006-07-09 to 2006-07-09. Participants: Matthias Lederhofer, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/4819 ## Matthias Lederhofer, 2006-07-09 09:59 Subject: [PATCH] change ent to tree in git-diff documentation Message-ID: URL: https://gitlist.dev/e/E1FzW4h-00058M-3u%40moooo.ath.cx ``` --- I've sent this patch a while ago and did not get any feedback, so here it is again. 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 ] {0,2} [...] +'git-diff' [ --diff-options ] {0,2} [...] 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 is given, the working tree and the index - file is compared, using `git-diff-files`. +* When no is given, the working tree and the index + file are compared, using `git-diff-files`. -* When one is given, the working tree and the named - tree is compared, using `git-diff-index`. The option +* When one 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 s are given, these two trees are compared +* When two s are given, these two trees are compared using `git-diff-tree`. OPTIONS -- 1.3.1.g9af0 ``` ## Junio C Hamano, 2006-07-09 10:24 Subject: Re: [PATCH] change ent to tree in git-diff documentation Message-ID: <7v1wsvnkj8.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v1wsvnkj8.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Matthias Lederhofer writes: > 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. I am not attached to at all, but I do not know if this is worth it. I suspect there are many other places you need to fix to make things consistent, and I think the first thing that should be touched is glossary.txt. ... goes "git grep -w ent", gets quite surprised and comes back ... Oops. I think you are right and I was wrong saying the above four lines. It is only git-diff.txt and glossay entry that talks about . Whoever coined (I do not remember anymore) do you mind this in addition to Matthias's patch? -- >8 -- Eradicate Technical documentation is not a place for riddles. Signed-off-by: Junio C Hamano --- diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 116ddb7..14449ca 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -86,7 +86,7 @@ directory:: ent:: Favorite synonym to "tree-ish" by some total geeks. See `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth - explanation. + explanation. Avoid this term, not to confuse people. fast forward:: A fast-forward is a special type of merge where you have ``` ## Johannes Schindelin, 2006-07-09 14:27 Subject: Re: [PATCH] change ent to tree in git-diff documentation Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.63.0607091626200.29667%40wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <7v1wsvnkj8.fsf@assigned-by-dhcp.cox.net> ``` Hi, On Sun, 9 Jul 2006, Junio C Hamano wrote: > Whoever coined (I do not remember anymore) do you mind > this in addition to Matthias's patch? AFAIR it was me. It was meant as a geek's joke from the beginning, and I even had the pleasure of Linus calling me a total geek. I do not have any objections against removing it. (AKA Ack.) Ciao, Dscho ```