path: root/Documentation/git-diff-tree.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-tree.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-tree.txt')
1 files changed, 3 insertions, 43 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index ab0ba4f..b2095cb 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -9,7 +9,7 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
-'git-diff-tree' [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [-t] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> <tree-ish> [<path>...]
+'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> <tree-ish> [<path>...]
@@ -19,6 +19,8 @@ Note that "git-diff-tree" can use the tree encapsulated in a commit object.
The id of a tree object.
@@ -29,51 +31,9 @@ OPTIONS
Note that this parameter does not provide any wildcard or regexp
- generate patch (see section on generating patches). For
- git-diff-tree, this flag implies '-r' as well.
- 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.
- Swap two input trees.
- 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.
- recurse
show tree entry itself as well as subtrees. Implies -r.
- \0 line termination on output
When '--root' is specified the initial commit will be showed as a big
creation event. This is equivalent to a diff against the NULL tree.