diff options
| author | Matthias Lederhofer <matled@gmx.net> | 2006-07-09 11:59:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 03:26:49 -0700 |
| commit | cfc01c038709e4cdbf506d29937cac2bc1b76d39 (patch) | |
| tree | 6e53efa0ec3a57eb99ca111fd41535c4266ec50f /Documentation | |
| parent | addf88e455f85bc6cfe0284b70aaad10b6d3486e (diff) | |
| download | git-cfc01c038709e4cdbf506d29937cac2bc1b76d39.tar.gz git-cfc01c038709e4cdbf506d29937cac2bc1b76d39.tar.xz | |
change ent to tree in git-diff documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff.txt | 18 | ||||
| -rw-r--r-- | Documentation/glossary.txt | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 7ab208037..228c4d95b 100644 --- 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 -------- -'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 diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 116ddb7fb..14449ca8b 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 |