X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-diff-cache.txt;h=f6dd7037d5cd675fdf5bb0e7214a6fafb6559c10;hb=a92bebe6978edaea2885a627e7bef6f7f8b208c2;hp=9c7832f6e2f48a2f74e7db9bbce5fea7cda5f390;hpb=af5323e0274fad058f13949b89a9191a7bef7e38;p=git.git diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt index 9c7832f6..f6dd7037 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] [-B] [-M] [-R] [-C] [-O] [-S] [--pickaxe-all] [--cached] [...] +'git-diff-cache' [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O] [-S] [--pickaxe-all] [...] DESCRIPTION ----------- @@ -44,6 +44,14 @@ OPTIONS -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 . @@ -57,7 +65,8 @@ OPTIONS , which has one shell glob pattern per line. -R:: - Output diff in reverse. + 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