X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=d8a0a86022b805eabe3516fe980d6c626abfa68e;hb=e66273a6abb8e9cd0967d52113e29c8014a255f8;hp=7248b35d952c3fe97496895059af35300694eb98;hpb=eec102524fda2df7d2846e865805ca213119bf10;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 7248b35d9..d8a0a8602 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] [-0|-1|-2|-3|-c|--cc] [] [...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [] [...] DESCRIPTION ----------- @@ -26,7 +26,7 @@ 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) 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". @@ -36,6 +36,9 @@ omit diff output for unmerged entries and just show "Unmerged". diff, similar to the way 'diff-tree' shows a merge commit with these flags. +--no-index:: + Compare the two given files / directories. + -q:: Remain silent even on nonexistent files @@ -55,4 +58,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list