diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-07 23:04:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-07 23:04:52 -0700 |
| commit | 35ef3a4c63d6b60cda8f26c842c0efee8d2cb5cc (patch) | |
| tree | 3573abf21f202ac1dbe1ef1b7e6aed1b97379329 /Documentation/git-diff.txt | |
| parent | 7c3693f1f240e17772c864fad35bc16226038fc8 (diff) | |
| download | git-35ef3a4c63d6b60cda8f26c842c0efee8d2cb5cc.tar.gz | |
Documentation updates.
Fill in more missing documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index f43a60f4f1..fc37ea7412 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -3,25 +3,39 @@ git-diff(1) NAME ---- -git-diff - Some git command not yet documented. +git-diff - Show changes between commits, commit and working tree, etc. SYNOPSIS -------- -'git-diff' [ --option ] <args>... +'git-diff' [ --diff-options ] <ent>{0,2} [<path>...] DESCRIPTION ----------- -Does something not yet documented. - +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. +The combination of what is compared with what is determined by +the number of ents given to the command. + +`----------------`--------`-----------------------------`------------------ +Number of ents Options What's Compared Underlying command +--------------------------------------------------------------------------- +0 - index file and working tree git-diff-files +1 --cached ent and index file git-diff-index +1 - ent and working tree git-diff-index +2 - two ents git-diff-tree +--------------------------------------------------------------------------- OPTIONS ------- ---option:: - Some option not yet documented. - -<args>...:: - Some argument not yet documented. +--diff-options:: + '--diff-options' are passed to the `git-diff-files`, + `git-diff-index`, and `git-diff-tree` commands. See the + documentation for these commands for description. + +<path>...:: + The <path> arguments are also passed to `git-diff-\*` + commands. Author |