summaryrefslogtreecommitdiff
path: root/Documentation/git-diff.txt
blob: fc37ea7412ad5976ccaef0e198a19b5bf1ffe057 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
git-diff(1)
===========
 
NAME
----
git-diff - Show changes between commits, commit and working tree, etc.
 
 
SYNOPSIS
--------
'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
 
DESCRIPTION
-----------
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
-------
--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
------
Written by Linus Torvalds <torvalds@osdl.org>
 
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
GIT
---
Part of the link:git.html[git] suite