diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-05 06:20:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-05 06:20:48 +0000 |
| commit | 2e6ded8990e867c457680899597363f3c1dd07f6 (patch) | |
| tree | a8b3625c96ffe486511441a9944dfcfe3231bf40 /git-diff.txt | |
| parent | d3dc64968e5141a389eeb491876e2aab1da90c24 (diff) | |
| download | git-htmldocs-2e6ded8990e867c457680899597363f3c1dd07f6.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-398-g0b0cd
Diffstat (limited to 'git-diff.txt')
| -rw-r--r-- | git-diff.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git-diff.txt b/git-diff.txt index dd1fb3278..f6ac84750 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -8,12 +8,17 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git diff' [<common diff options>] <commit>{0,2} [--] [<path>...] +[verse] +'git diff' [options] [<commit>] [--] [<path>...] +'git diff' [options] --cached [<commit>] [--] [<path>...] +'git diff' [options] <commit> <commit> [--] [<path>...] +'git diff' [options] [--no-index] [--] <path> <path> DESCRIPTION ----------- -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. +Show changes between the working tree and the index or a tree, changes +between the index and a tree, changes between two trees, or changes +between two files on disk. 'git diff' [--options] [--] [<path>...]:: |