X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=3b04bfeec6ad18edffd9b6d44709a10fdda36b8c;hb=2c4ed386e8861e730037abe4f4d9e032c5c46242;hp=166238f5c68480543d1da7ae09f8195d768fa81f;hpb=5c97558c9a813a0a775c438a79cfc438def00c22;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 166238f5..3b04bfee 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -1,40 +1,29 @@ git-diff-files(1) ================= -v0.1, May 2005 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 -------- -'git-diff-files' [-p] [-q] [-r] [-z] [-M] [...] +'git-diff-files' [-q] [] [...] 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 -same as "git-diff-cache" and "git-diff-tree". +entries in the index are compared. The output format is the +same as "git-diff-index" and "git-diff-tree". OPTIONS ------- --p:: - generate patch (see section on generating patches). +include::diff-options.txt[] -q:: Remain silent even on nonexisting files --M:: - Detect renames; implies -p. - --r:: - This flag does not mean anything. It is there only to match - git-diff-tree. Unlike git-diff-tree, git-diff-files always looks - at all the subdirectories. - - Output format ------------- include::diff-format.txt[] @@ -50,5 +39,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list