index b78c4c64f1b2638b8be42072a0f9a4eab1362f7f..d8a0a86022b805eabe3516fe980d6c626abfa68e 100644 (file)
SYNOPSIS
--------
-'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [<common diff options>] [<path>...]
+'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>...]
DESCRIPTION
-----------
branch" respectively. With these options, diffs for
merged entries are not shown.
+
-The default is to diff against our branch (-2) and the
+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".
diff, similar to the way 'diff-tree' shows a merge
commit with these flags.
-\-n,\--no-index::
+--no-index::
Compare the two given files / directories.
-q::
GIT
---
Part of the gitlink:git[7] suite
-