X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=58137b3b9ebb3d1ca8a323b4c13511013e359f92;hb=c859600954df4c292ec7c81d7f2f9d0a62b5975b;hp=166238f5c68480543d1da7ae09f8195d768fa81f;hpb=5c97558c9a813a0a775c438a79cfc438def00c22;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 166238f5..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] [...] +'git-diff-files' [-p] [-q] [-r] [-z] [-B] [-M] [-C] [-R] [-O] [-S] [--pickaxe-all] [...] DESCRIPTION ----------- @@ -26,8 +26,30 @@ OPTIONS -q:: Remain silent even on nonexisting files +-R:: + 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. + +-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