Merge branch 'maint'

[git.git] / Documentation / git-diff-files.txt

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index b45d1e69da30cae6fad7eec3694c1768774519b8..5c8c1d95a89b15e936816f486a8114cbc6788fb9 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -8,14 +8,14 @@ git-diff-files - Compares files in the working tree and the index
 
 SYNOPSIS
 --------
-'git-diff-files' [-q] [<common diff options>] [<path>...]
+'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
 
 DESCRIPTION
 -----------
 Compares the files in the working tree and the index.  When paths
 are specified, compares only those named paths.  Otherwise all
 entries in the index are compared.  The output format is the
-same as "git-diff-index" and "git-diff-tree".
+same as for 'git-diff-index' and 'git-diff-tree'.
 
 OPTIONS
 -------
@@ -26,13 +26,19 @@ include::diff-options.txt[]
        branch" respectively.  With these options, diffs for
        merged entries are not shown.
 +
-The default is to diff against our branch (-2) if there
-is an unmerged path, and show diff for unmerged entries
-otherwise.  The option -0 can be given to force diff for
-unmerged entries even when the index is unmerged.
+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".
+
+-c::
+--cc::
+       This compares stage 2 (our branch), stage 3 (their
+       branch) and the working tree file and outputs a combined
+       diff, similar to the way 'diff-tree' shows a merge
+       commit with these flags.
 
 -q::
-       Remain silent even on nonexisting files
+       Remain silent even on nonexistent files
 
 Output format
 -------------
@@ -49,5 +55,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite