X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=3e1244f8d316134cd33c96f74199a56bb2625e20;hb=de2b82c65dac0e9768bc32f38e96b61d0b778843;hp=51a3d0fcd66153479aa31ef0a7eb943a85da88f9;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 51a3d0fcd..3e1244f8d 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' [-q] [] [...] DESCRIPTION ----------- @@ -20,31 +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:: - Output diff in reverse. - --M:: - Detect renames; implies -p. - --C:: - Detect copies as well as renames; implies -p. - --S:: - Look for differences that contains the change in . - - --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[]