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] [<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) if there 30is an unmerged path, and show diff for unmerged entries 31otherwise. The option -0 can be given to force diff for 32unmerged entries even when the index is unmerged. 33 34-q:: 35 Remain silent even on nonexisting files 36 37Output format 38------------- 39include::diff-format.txt[] 40 41 42Author 43------ 44Written by Linus Torvalds <torvalds@osdl.org> 45 46Documentation 47-------------- 48Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 49 50GIT 51--- 52Part of the gitlink:git[7] suite 53