X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=32e9a1e7609eb6f6474bbf94be38585223fcda66;hb=f13bbe7f56e49a11f6bfc3b73a463c741f969c9c;hp=ba257e8fb075df302f304912b0207f27c2a204bb;hpb=f345b0a066572206aac4a4f9a57d746e213b6bff;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index ba257e8f..32e9a1e7 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the cache SYNOPSIS -------- -'git-diff-files' [-p] [-q] [-r] [-z] [-B] [-M] [-C] [-R] [-S] [--pickaxe-all] [...] +'git-diff-files' [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O] [-S] [--pickaxe-all] [...] DESCRIPTION ----------- @@ -27,7 +27,8 @@ OPTIONS Remain silent even on nonexisting files -R:: - Output diff in reverse. + Swap two inputs; that is, show differences from on-disk files + to cache contents. -B:: Break complete rewrite changes into pairs of delete and create. @@ -38,6 +39,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 . @@ -46,6 +55,10 @@ 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:: This flag does not mean anything. It is there only to match git-diff-tree. Unlike git-diff-tree, git-diff-files always looks