X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-cache.txt;h=b463593408f165c50ec0ab6639f078b2e8ae4688;hb=2bbcddee877c01ea1008efe2137d7ef599189ef5;hp=e89aaa503ff18bb96442f9ecf499bd5734679df5;hpb=81e50eabf06dd68e8e62a9b697eaf60904c58b22;p=git.git diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt index e89aaa50..b4635934 100644 --- a/Documentation/git-diff-cache.txt +++ b/Documentation/git-diff-cache.txt @@ -9,43 +9,23 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi SYNOPSIS -------- -'git-diff-cache' [-p] [-r] [-z] [-m] [-M] [-R] [-C] [-S] [--cached] +'git-diff-cache' [-m] [--cached] [] [...] DESCRIPTION ----------- -Compares the content and mode of the blobs found via a tree object -with the content of the current cache and, optionally ignoring the -stat state of the file on disk. +Compares the content and mode of the blobs found via a tree +object with the content of the current cache and, optionally +ignoring the stat state of the file on disk. When paths are +specified, compares only those named paths. Otherwise all +entries in the cache are compared. OPTIONS ------- +include::diff-options.txt[] + :: The id of a tree object to diff against. --p:: - Generate patch (see section on generating patches) - --r:: - This flag does not mean anything. It is there only to match - "git-diff-tree". Unlike "git-diff-tree", "git-diff-cache" - always looks at all the subdirectories. - --z:: - \0 line termination on output - --M:: - Detect renames. - --C:: - Detect copies as well as renames. - --S:: - Look for differences that contains the change in . - - --R:: - Output diff in reverse. - --cached:: do not consider the on-disk file at all