Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 1 | git-diff(1) |
| 2 | =========== |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 3 | |
| 4 | NAME |
| 5 | ---- |
Junio C Hamano | 35ef3a4 | 2005-09-07 23:04:52 -0700 | [diff] [blame] | 6 | git-diff - Show changes between commits, commit and working tree, etc. |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
Junio C Hamano | 35ef3a4 | 2005-09-07 23:04:52 -0700 | [diff] [blame] | 11 | 'git-diff' [ --diff-options ] <ent>{0,2} [<path>...] |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 12 | |
| 13 | DESCRIPTION |
| 14 | ----------- |
Junio C Hamano | 35ef3a4 | 2005-09-07 23:04:52 -0700 | [diff] [blame] | 15 | Show changes between two ents, an ent and the working tree, an |
| 16 | ent and the index file, or the index file and the working tree. |
| 17 | The combination of what is compared with what is determined by |
| 18 | the number of ents given to the command. |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 19 | |
Junio C Hamano | 35ef3a4 | 2005-09-07 23:04:52 -0700 | [diff] [blame] | 20 | `----------------`--------`-----------------------------`------------------ |
| 21 | Number of ents Options What's Compared Underlying command |
| 22 | --------------------------------------------------------------------------- |
| 23 | 0 - index file and working tree git-diff-files |
| 24 | 1 --cached ent and index file git-diff-index |
| 25 | 1 - ent and working tree git-diff-index |
| 26 | 2 - two ents git-diff-tree |
| 27 | --------------------------------------------------------------------------- |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 28 | |
| 29 | OPTIONS |
| 30 | ------- |
Junio C Hamano | 35ef3a4 | 2005-09-07 23:04:52 -0700 | [diff] [blame] | 31 | --diff-options:: |
| 32 | '--diff-options' are passed to the `git-diff-files`, |
| 33 | `git-diff-index`, and `git-diff-tree` commands. See the |
| 34 | documentation for these commands for description. |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 35 | |
Junio C Hamano | 35ef3a4 | 2005-09-07 23:04:52 -0700 | [diff] [blame] | 36 | <path>...:: |
| 37 | The <path> arguments are also passed to `git-diff-\*` |
| 38 | commands. |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 39 | |
| 40 | |
| 41 | Author |
| 42 | ------ |
| 43 | Written by Linus Torvalds <torvalds@osdl.org> |
| 44 | |
| 45 | Documentation |
| 46 | -------------- |
| 47 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 48 | |
| 49 | GIT |
| 50 | --- |
Sergey Vlasov | a7154e9 | 2005-09-19 14:10:51 +0400 | [diff] [blame] | 51 | Part of the gitlink:git[7] suite |
Junio C Hamano | 7fc9d69 | 2005-08-23 01:49:47 -0700 | [diff] [blame] | 52 | |