Merge branch 'np/types'
[git/git.git] / Documentation / git-diff-files.txt
CommitLineData
2cf565c5
DG
1git-diff-files(1)
2=================
2cf565c5
DG
3
4NAME
5----
5f3aa197 6git-diff-files - Compares files in the working tree and the index
2cf565c5
DG
7
8
9SYNOPSIS
10--------
d516c2d1 11'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [<common diff options>] [<path>...]
2cf565c5
DG
12
13DESCRIPTION
14-----------
5f3aa197 15Compares the files in the working tree and the index. When paths
2cf565c5 16are specified, compares only those named paths. Otherwise all
5f3aa197 17entries in the index are compared. The output format is the
215a7ad1 18same as "git-diff-index" and "git-diff-tree".
2cf565c5
DG
19
20OPTIONS
21-------
dda2d79a 22include::diff-options.txt[]
2cf565c5 23
10637b84
LT
24-1 -2 -3 or --base --ours --theirs, and -0::
25 Diff against the "base" version, "our branch" or "their
26 branch" respectively. With these options, diffs for
27 merged entries are not shown.
28+
15bf57a1
JH
29The default is to diff against our branch (-2) and the
30cleanly resolved paths. The option -0 can be given to
31omit diff output for unmerged entries and just show "Unmerged".
10637b84 32
34801cab
JH
33-c,--cc::
34 This compares stage 2 (our branch), stage 3 (their
35 branch) and the working tree file and outputs a combined
36 diff, similar to the way 'diff-tree' shows a merge
37 commit with these flags.
38
d516c2d1
JS
39\-n,\--no-index::
40 Compare the two given files / directories.
41
2cf565c5 42-q::
addf88e4 43 Remain silent even on nonexistent files
2cf565c5 44
2cf565c5
DG
45Output format
46-------------
47include::diff-format.txt[]
48
49
50Author
51------
52Written by Linus Torvalds <torvalds@osdl.org>
53
54Documentation
55--------------
56Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
57
58GIT
59---
a7154e91 60Part of the gitlink:git[7] suite
2cf565c5 61