X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff.txt;h=228c4d95bd41d40bbb32cfcb6b9a7dc648280fa5;hb=d9c04ba3ddd0945ef18657a2a373c5edfe86ef7c;hp=7ab20803761b0d5ac69e3b9acc31ed4e9d59ef4c;hpb=bf41bf2db71ac4bb03248bb0fe18cbb718af497a;p=git.git 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 ] {0,2} [...] +'git-diff' [ --diff-options ] {0,2} [...] 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 is given, the working tree and the index - file is compared, using `git-diff-files`. +* When no is given, the working tree and the index + file are compared, using `git-diff-files`. -* When one is given, the working tree and the named - tree is compared, using `git-diff-index`. The option +* When one 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 s are given, these two trees are compared +* When two s are given, these two trees are compared using `git-diff-tree`. OPTIONS