6 git-diff-files - Compares files in the working tree and the index
11 'git-diff-files' [-q] [<common diff options>] [<path>...]
15 Compares the files in the working tree and the index. When paths
16 are specified, compares only those named paths. Otherwise all
17 entries in the index are compared. The output format is the
18 same as "git-diff-index" and "git-diff-tree".
22 include::diff-options.txt[]
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.
29 The default is to diff against our branch (-2) if there
30 is an unmerged path, and show diff for unmerged entries
31 otherwise. The option -0 can be given to force diff for
32 unmerged entries even when the index is unmerged.
35 Remain silent even on nonexisting files
39 include::diff-format.txt[]
44 Written by Linus Torvalds <torvalds@osdl.org>
48 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
52 Part of the gitlink:git[7] suite