index 0ad2f89550dd325b52a02fd00dc0e26b368b60ce..67f51265e6aeadf85db582fe89c2c5752b36745a 100644 (file)
git-diff-files(1)
=================
-v0.1, May 2005
NAME
----
-git-diff-files - Compares files in the working tree and the cache
+git-diff-files - Compares files in the working tree and the index
SYNOPSIS
--------
-'git-diff-files' [-p] [-q] [-r] [-z] [<pattern>...]
+'git-diff-files' [-q] [<common diff options>] [<path>...]
DESCRIPTION
-----------
-Compares the files in the working tree and the cache. When paths
+Compares the files in the working tree and the index. When paths
are specified, compares only those named paths. Otherwise all
-entries in the cache are compared. The output format is the
-same as "git-diff-cache" and "git-diff-tree".
+entries in the index are compared. The output format is the
+same as "git-diff-index" and "git-diff-tree".
OPTIONS
-------
--p::
- generate patch (see section on generating patches).
+include::diff-options.txt[]
+
+-1 -2 -3 or --base --ours --theirs, and -0::
+ Diff against the "base" version, "our branch" or "their
+ branch" respectively. With these options, diffs for
+ merged entries are not shown.
++
+The default is to diff against our branch (-2) and the
+cleanly resolved paths. The option -0 can be given to
+omit diff output for unmerged entries and just show "Unmerged".
-q::
Remain silent even on nonexisting files
--r::
- This flag does not mean anything. It is there only to match
- git-diff-tree. Unlike git-diff-tree, git-diff-files always looks
- at all the subdirectories.
-
-
Output format
-------------
include::diff-format.txt[]
GIT
---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite