X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-cache.txt;h=f6dd7037d5cd675fdf5bb0e7214a6fafb6559c10;hb=b43d44779bf98977b211256f936d0edda8a9625a;hp=10cbc9ff9365b0b87d9a263bbc1d70e04e8a8f43;hpb=f345b0a066572206aac4a4f9a57d746e213b6bff;p=git.git diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt index 10cbc9ff..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] [-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 . @@ -52,8 +60,13 @@ OPTIONS 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:: - 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