X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=67f51265e6aeadf85db582fe89c2c5752b36745a;hb=c1fe2fe4fe685e0587c3949f953aab726de88994;hp=e3873888f2236acb3ac04a6cda3784d61a2ce1a2;hpb=d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index e3873888..67f51265 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -3,7 +3,7 @@ git-diff-files(1) NAME ---- -git-diff-files - Compares files in the working tree and the cache +git-diff-files - Compares files in the working tree and the index SYNOPSIS @@ -12,15 +12,24 @@ SYNOPSIS DESCRIPTION ----------- -Compares the files in the working tree and the cache. When paths +Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all -entries in the cache are compared. The output format is the +entries in the index are compared. The output format is the same as "git-diff-index" and "git-diff-tree". OPTIONS ------- include::diff-options.txt[] +-1 -2 -3 or --base --ours --theirs, and -0:: + Diff against the "base" version, "our branch" or "their + branch" respectively. With these options, diffs for + merged entries are not shown. ++ +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". + -q:: Remain silent even on nonexisting files