blob: cadaf59455c994c5c08fbdb84f9c0ed1bc974325 [file] [log] [blame]
Junio C Hamano215a7ad2005-09-07 17:26:23 -07001git-diff(1)
2===========
Junio C Hamano7fc9d692005-08-23 01:49:47 -07003
4NAME
5----
Junio C Hamano35ef3a42005-09-07 23:04:52 -07006git-diff - Show changes between commits, commit and working tree, etc.
Junio C Hamano7fc9d692005-08-23 01:49:47 -07007
8
9SYNOPSIS
10--------
Junio C Hamano35ef3a42005-09-07 23:04:52 -070011'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
Junio C Hamano7fc9d692005-08-23 01:49:47 -070012
13DESCRIPTION
14-----------
Junio C Hamano35ef3a42005-09-07 23:04:52 -070015Show changes between two ents, an ent and the working tree, an
16ent and the index file, or the index file and the working tree.
17The combination of what is compared with what is determined by
18the number of ents given to the command.
Junio C Hamano7fc9d692005-08-23 01:49:47 -070019
Junio C Hamano35ef3a42005-09-07 23:04:52 -070020`----------------`--------`-----------------------------`------------------
21Number of ents Options What's Compared Underlying command
22---------------------------------------------------------------------------
230 - index file and working tree git-diff-files
241 --cached ent and index file git-diff-index
251 - ent and working tree git-diff-index
262 - two ents git-diff-tree
27---------------------------------------------------------------------------
Junio C Hamano7fc9d692005-08-23 01:49:47 -070028
29OPTIONS
30-------
Junio C Hamano35ef3a42005-09-07 23:04:52 -070031--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 Hamano7fc9d692005-08-23 01:49:47 -070035
Junio C Hamano35ef3a42005-09-07 23:04:52 -070036<path>...::
37 The <path> arguments are also passed to `git-diff-\*`
38 commands.
Junio C Hamano7fc9d692005-08-23 01:49:47 -070039
40
41Author
42------
43Written by Linus Torvalds <torvalds@osdl.org>
44
45Documentation
46--------------
47Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
48
49GIT
50---
Sergey Vlasova7154e92005-09-19 14:10:51 +040051Part of the gitlink:git[7] suite
Junio C Hamano7fc9d692005-08-23 01:49:47 -070052