X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=58137b3b9ebb3d1ca8a323b4c13511013e359f92;hb=000182eacf99cde27d5916aa415921924b82972c;hp=51a3d0fcd66153479aa31ef0a7eb943a85da88f9;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 51a3d0fc..58137b3b 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] [-M] [-C] [-R] [-S] [...] +'git-diff-files' [-p] [-q] [-r] [-z] [-B] [-M] [-C] [-R] [-O] [-S] [--pickaxe-all] [...] DESCRIPTION ----------- @@ -27,17 +27,29 @@ 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. -M:: - Detect renames; implies -p. + Detect renames. -C:: - Detect copies as well as renames; implies -p. + Detect copies as well as renames. -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:: This flag does not mean anything. It is there only to match