diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-07-09 20:38:54 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-07-09 20:38:54 +0000 |
commit | 51c2ab075b2b9f9af2734cb54753534bbda88696 (patch) | |
tree | cbb8b80ebc6d46add639113a939902f94f2f9d0a /git-diff.txt | |
parent | c26f5488a78cd9e6bdcc963590ca3a5895877906 (diff) | |
download | git-htmldocs-51c2ab075b2b9f9af2734cb54753534bbda88696.tar.gz |
Autogenerated HTML docs for v1.4.1-gff4c8
Diffstat (limited to 'git-diff.txt')
-rw-r--r-- | git-diff.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-diff.txt b/git-diff.txt index 7ab208037..228c4d95b 100644 --- a/git-diff.txt +++ b/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 |