index 67f51265e6aeadf85db582fe89c2c5752b36745a..7248b35d952c3fe97496895059af35300694eb98 100644 (file)
SYNOPSIS
--------
-'git-diff-files' [-q] [<common diff options>] [<path>...]
+'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
DESCRIPTION
-----------
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
-------------