@matheusbsbs / matheus-bagliano / commits / cfc01c0387
Fork 0

change ent to tree in git-diff documentation

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

Matthias Lederhofer committed Jul 9, 2006 at 11:59 UTC cfc01c038709e4cdbf506d29937cac2bc1b76d39
2 files changed +10 -10
Documentation/git-diff.txt
+9 -9
@@ -8,24 +8,24 @@ git-diff - Show changes between commits, commit and working tree, etc
8
9 SYNOPSIS
10 --------
11 -'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
11 +'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
12
13 DESCRIPTION
14 -----------
15 -Show changes between two ents, an ent and the working tree, an
16 -ent and the index file, or the index file and the working tree.
15 +Show changes between two trees, a tree and the working tree, a
16 +tree and the index file, or the index file and the working tree.
17 The combination of what is compared with what is determined by
18 -the number of ents given to the command.
18 +the number of trees given to the command.
19
20 -* When no <ent> is given, the working tree and the index
21 - file is compared, using `git-diff-files`.
20 +* When no <tree-ish> is given, the working tree and the index
21 + file are compared, using `git-diff-files`.
22
23 -* When one <ent> is given, the working tree and the named
24 - tree is compared, using `git-diff-index`. The option
23 +* When one <tree-ish> is given, the working tree and the named
24 + tree are compared, using `git-diff-index`. The option
25 `--cached` can be given to compare the index file and
26 the named tree.
27
28 -* When two <ent>s are given, these two trees are compared
28 +* When two <tree-ish>s are given, these two trees are compared
29 using `git-diff-tree`.
30
31 OPTIONS
Documentation/glossary.txt
+1 -1
@@ -86,7 +86,7 @@ directory::
86 ent::
87 Favorite synonym to "tree-ish" by some total geeks. See
88 `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
89 - explanation.
89 + explanation. Avoid this term, not to confuse people.
90
91 fast forward::
92 A fast-forward is a special type of merge where you have