]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-diff(1) |
2 | =========== | |
7fc9d69f JH |
3 | |
4 | NAME | |
5 | ---- | |
35ef3a4c | 6 | git-diff - Show changes between commits, commit and working tree, etc. |
7fc9d69f JH |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
35ef3a4c | 11 | 'git-diff' [ --diff-options ] <ent>{0,2} [<path>...] |
7fc9d69f JH |
12 | |
13 | DESCRIPTION | |
14 | ----------- | |
35ef3a4c JH |
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. | |
19 | ||
dfa2f22f JH |
20 | * When no <ent> is given, the working tree and the index |
21 | file is compared, using `git-diff-files`. | |
22 | ||
23 | * When one <ent> is given, the working tree and the named | |
24 | tree is compared, using `git-diff-index`. The option | |
25 | `--cached` can be given to compare the index file and | |
26 | the named tree. | |
27 | ||
28 | * When two <ent>s are given, these two trees are compared | |
29 | using `git-diff-tree`. | |
7fc9d69f JH |
30 | |
31 | OPTIONS | |
32 | ------- | |
35ef3a4c JH |
33 | --diff-options:: |
34 | '--diff-options' are passed to the `git-diff-files`, | |
35 | `git-diff-index`, and `git-diff-tree` commands. See the | |
36 | documentation for these commands for description. | |
37 | ||
38 | <path>...:: | |
39 | The <path> arguments are also passed to `git-diff-\*` | |
40 | commands. | |
7fc9d69f JH |
41 | |
42 | ||
43 | Author | |
44 | ------ | |
45 | Written by Linus Torvalds <torvalds@osdl.org> | |
46 | ||
47 | Documentation | |
48 | -------------- | |
49 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
50 | ||
51 | GIT | |
52 | --- | |
a7154e91 | 53 | Part of the gitlink:git[7] suite |
7fc9d69f | 54 |