X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-cache.txt;h=b463593408f165c50ec0ab6639f078b2e8ae4688;hb=9b011b2fe5379f76c53f20b964d7a3cecb9d8c79;hp=f6dd7037d5cd675fdf5bb0e7214a6fafb6559c10;hpb=232b75ab3d60475b19270be022a966772c25c84b;p=git.git diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt index f6dd7037..b4635934 100644 --- a/Documentation/git-diff-cache.txt +++ b/Documentation/git-diff-cache.txt @@ -9,7 +9,7 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi SYNOPSIS -------- -'git-diff-cache' [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O] [-S] [--pickaxe-all] [...] +'git-diff-cache' [-m] [--cached] [] [...] DESCRIPTION ----------- @@ -21,53 +21,11 @@ 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 - --B:: - Break complete rewrite changes into pairs of delete and create. - --M:: - Detect renames. - --C:: - Detect copies as well as renames. - ---find-copies-harder:: - By default, -C option finds copies only if the original - file of the copy was modified in the same changeset for - performance reasons. This flag makes the command - inspect unmodified files as candidates for the source of - copy. This is a very expensive operation for large - projects, so use it with caution. - --S:: - Look for differences that contains the change in . - ---pickaxe-all:: - When -S finds a change, show all the changes in that - changeset, not just the files that contains the change - in . - --O:: - Output the patch in the order specified in the - , which has one shell glob pattern per line. - --R:: - Swap two inputs; that is, show differences from cache or - on-disk file to tree contents. - --cached:: do not consider the on-disk file at all