path: root/Documentation/git-diff-files.txt
diff options
authorJunio C Hamano <>2005-07-13 19:52:35 (GMT)
committerLinus Torvalds <>2005-07-13 20:09:17 (GMT)
commitdda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch)
tree0252e50a800caa678f835ee26193e5f728459f0a /Documentation/git-diff-files.txt
parent52f28529f4f90cebdca47f8eacbff5cb20004bed (diff)
[PATCH] Clean up diff option descriptions.
I got tired of maintaining almost duplicated descriptions in diff-* brothers, both in usage string and documentation. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'Documentation/git-diff-files.txt')
1 files changed, 2 insertions, 42 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 32e9a1e..3e1244f 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
-'git-diff-files' [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]
+'git-diff-files' [-q] [<common diff options>] [<path>...]
@@ -20,51 +20,11 @@ same as "git-diff-cache" and "git-diff-tree".
- generate patch (see section on generating patches).
Remain silent even on nonexisting files
- Swap two inputs; that is, show differences from on-disk files
- to cache contents.
- Break complete rewrite changes into pairs of delete and create.
- Detect renames.
- Detect copies as well as renames.
- By default, -C option finds copies only if the original
- file of the copy was modified in the same changeset for
- performance reasons. This flag makes the command
- inspect unmodified files as candidates for the source of
- copy. This is a very expensive operation for large
- projects, so use it with caution.
- Look for differences that contains the change in <string>.
- When -S finds a change, show all the changes in that
- changeset, not just the files that contains the change
- in <string>.
- Output the patch in the order specified in the
- <orderfile>, which has one shell glob pattern per line.
- 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