X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=3e1244f8d316134cd33c96f74199a56bb2625e20;hb=15ac5164427d838d9377643dcdd03edd770cf001;hp=58137b3b9ebb3d1ca8a323b4c13511013e359f92;hpb=ce24067549a8554b214e723d7aa4bc063c54409e;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 58137b3b..3e1244f8 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] [-O] [-S] [--pickaxe-all] [...] +'git-diff-files' [-q] [] [...] DESCRIPTION ----------- @@ -20,43 +20,11 @@ same as "git-diff-cache" and "git-diff-tree". OPTIONS ------- --p:: - generate patch (see section on generating patches). +include::diff-options.txt[] -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. - --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 - git-diff-tree. Unlike git-diff-tree, git-diff-files always looks - at all the subdirectories. - - Output format ------------- include::diff-format.txt[]