X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=d8a0a86022b805eabe3516fe980d6c626abfa68e;hb=dc3e3ea3c838c1ddf7423401b4cf7a7dba528cff;hp=b78c4c64f1b2638b8be42072a0f9a4eab1362f7f;hpb=7f09ac4714214d1dc12877cc98fb69cdee22e33e;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index b78c4c64f..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|-n|--no-index] [] [...] +'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,7 +36,7 @@ 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:: @@ -58,4 +58,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list