Merge http://www.kernel.org/pub/scm/gitk/gitk
[git/git.git] / Documentation / git-diff.txt
1 git-diff(1)
2 ===========
3
4 NAME
5 ----
6 git-diff - Show changes between commits, commit and working tree, etc.
7
8
9 SYNOPSIS
10 --------
11 'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
12
13 DESCRIPTION
14 -----------
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
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 ---------------------------------------------------------------------------
28
29 OPTIONS
30 -------
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.
35
36 <path>...::
37 The <path> arguments are also passed to `git-diff-\*`
38 commands.
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 ---
51 Part of the gitlink:git[7] suite
52