1git-diff-files(1) 2================= 3 4NAME 5---- 6git-diff-files - Compares files in the working tree and the index 7 8 9SYNOPSIS 10-------- 11'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...] 12 13DESCRIPTION 14----------- 15Compares the files in the working tree and the index. When paths 16are specified, compares only those named paths. Otherwise all 17entries in the index are compared. The output format is the 18same as "git-diff-index" and "git-diff-tree". 19 20OPTIONS 21------- 22include::diff-options.txt[] 23 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+ 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". 32 33-c:: 34--cc:: 35 This compares stage 2 (our branch), stage 3 (their 36 branch) and the working tree file and outputs a combined 37 diff, similar to the way 'diff-tree' shows a merge 38 commit with these flags. 39 40-q:: 41 Remain silent even on nonexistent files 42 43Output format 44------------- 45include::diff-format.txt[] 46 47 48Author 49------ 50Written by Linus Torvalds <torvalds@osdl.org> 51 52Documentation 53-------------- 54Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 55 56GIT 57--- 58Part of the linkgit:git[1] suite