change ent to tree in git-diff documentation

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

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 7ab20803761b0d5ac69e3b9acc31ed4e9d59ef4c..228c4d95bd41d40bbb32cfcb6b9a7dc648280fa5 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,24 +8,24 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
+'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]

 
 DESCRIPTION
 -----------
 
 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 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.
 
   `--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
   using `git-diff-tree`.
 
 OPTIONS

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 116ddb7fbfd7654bb7330e8f56dd03a9be029cd1..14449ca8baeb7c2c979d0fd3f61ce683fd8e08ce 100644 (file)
--- 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
 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
 
 fast forward::
        A fast-forward is a special type of merge where you have