X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=eb9fb742592bd70d11415c95342e2b75450b361f;hb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed;hp=9f9bb1453121ae9f8641ca65dfe70d2575ffa2f9;hpb=81e50eabf06dd68e8e62a9b697eaf60904c58b22;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 9f9bb145..eb9fb742 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -9,42 +9,22 @@ 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 ----------- Compares the files in the working tree and the cache. When paths are specified, compares only those named paths. Otherwise all entries in the cache are compared. The output format is the -same as "git-diff-cache" and "git-diff-tree". +same as "git-diff-index" 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. - --C:: - Detect copies as well as renames. - --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[] @@ -60,5 +40,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list