X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=481b8b3aa09539ff71a3f48b0b50b75e9ccce7a7;hb=42d328701dbdbc02c3361673629a44df478e69d7;hp=b45d1e69da30cae6fad7eec3694c1768774519b8;hpb=10637b84d91cf8870d1db8609a10dc5e58722378;p=git.git

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index b45d1e69..481b8b3a 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -8,7 +8,7 @@ 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
 -----------
@@ -26,10 +26,15 @@ 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