mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-29 16:41:53 +02:00
Code

change ent to tree in git-diff documentation

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Matthias Lederhofer 2006-07-09 11:59:39 +02:00 committed by Junio C Hamano
parent addf88e455
commit cfc01c0387
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/git-diff.txt
View File

@ -8,24 +8,24 @@ git-diff - Show changes between commits, commit and working tree, etc
SYNOPSIS
--------
'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
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 <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.
* 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

2
Documentation/glossary.txt
View File

@ -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