X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=ca1bb6a8ee9ccb6ffa5a01c7e13af7c8caa83cdf;hb=6304c29d518206b0780291a02f94f435abf82d74;hp=2e1e29ef5ae633a005e35f656f30ce66e343de7a;hpb=070739fd351702ea9bb4f65595728ae25a488075;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 2e1e29ef5..ca1bb6a8e 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|--no-index] [] [...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] 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,9 +36,6 @@ 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 @@ -57,5 +54,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list