projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision parsing: make "rev -- paths" checks stronger.
[git.git]
/
Documentation
/
git-diff-files.txt
diff --git
a/Documentation/git-diff-files.txt
b/Documentation/git-diff-files.txt
index
67f5126
..
481b8b3
100644
(file)
--- 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
--------
SYNOPSIS
--------
-'git-diff-files' [-q] [<common diff options>] [<path>...]
+'git-diff-files' [-q] [
-0|-1|-2|-3|-c|--cc] [
<common diff options>] [<path>...]
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-30,6
+30,12
@@
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".
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
-q::
Remain silent even on nonexisting files