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 for 'git-diff-index' and 'git-diff-tree'. 19 20OPTIONS 21------- 22include::diff-options.txt[] 23 24-1 --base:: 25-2 --ours:: 26-3 --theirs:: 27-0:: 28 Diff against the "base" version, "our branch" or "their 29 branch" respectively. With these options, diffs for 30 merged entries are not shown. 31+ 32The default is to diff against our branch (-2) and the 33cleanly resolved paths. The option -0 can be given to 34omit diff output for unmerged entries and just show "Unmerged". 35 36-c:: 37--cc:: 38 This compares stage 2 (our branch), stage 3 (their 39 branch) and the working tree file and outputs a combined 40 diff, similar to the way 'diff-tree' shows a merge 41 commit with these flags. 42 43-q:: 44 Remain silent even on nonexistent files 45 46Output format 47------------- 48include::diff-format.txt[] 49 50 51Author 52------ 53Written by Linus Torvalds <torvalds@osdl.org> 54 55Documentation 56-------------- 57Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 58 59GIT 60--- 61Part of the linkgit:git[1] suite