path: root/Documentation/git-diff-cache.txt
diff options
Diffstat (limited to 'Documentation/git-diff-cache.txt')
1 files changed, 3 insertions, 45 deletions
diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt
index f6dd703..b463593 100644
--- a/Documentation/git-diff-cache.txt
+++ b/Documentation/git-diff-cache.txt
@@ -9,7 +9,7 @@ git-diff-cache - Compares content and mode of blobs between the cache and reposi
-'git-diff-cache' [-p] [-r] [-z] [-m] [--cached] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> [<path>...]
+'git-diff-cache' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
@@ -21,53 +21,11 @@ entries in the cache are compared.
The id of a tree object to diff against.
- Generate patch (see section on generating patches)
- This flag does not mean anything. It is there only to match
- "git-diff-tree". Unlike "git-diff-tree", "git-diff-cache"
- always looks at all the subdirectories.
- \0 line termination on output
- 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.
- Swap two inputs; that is, show differences from cache or
- on-disk file to tree contents.
do not consider the on-disk file at all