Re: [PATCH] change ent to tree in git-diff documentation

From: Junio C Hamano <junkio@cox.net>
Date: Jul 9, 2006, 10:24 UTC
Message-ID: <7v1wsvnkj8.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <E1FzW4h-00058M-3u@moooo.ath.cx>

Matthias Lederhofer <matled@gmx.net> 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 <ent> 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 <ent>.

Whoever coined <ent> (I do not remember anymore) do you mind this in addition to Matthias's patch?

-- >8 -- Eradicate <ent>

Technical documentation is not a place for riddles.

Signed-off-by: Junio C Hamano <junkio@cox.net>

---

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