From dda2d79af2d2858b37bab7f6e088d0730c0959d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 13 Jul 2005 12:52:35 -0700 Subject: [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 --- Documentation/git-diff-tree.txt | 46 +++-------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) (limited to 'Documentation/git-diff-tree.txt') diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index ab0ba4fb17..b2095cb049 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 SYNOPSIS -------- -'git-diff-tree' [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [-t] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O] [-S] [--pickaxe-all] [...] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [] [...] DESCRIPTION ----------- @@ -19,6 +19,8 @@ Note that "git-diff-tree" can use the tree encapsulated in a commit object. OPTIONS ------- +include::diff-options.txt[] + :: The id of a tree object. @@ -29,51 +31,9 @@ OPTIONS Note that this parameter does not provide any wildcard or regexp features. --p:: - generate patch (see section on generating patches). For - git-diff-tree, this flag implies '-r' as well. - --B:: - Break complete rewrite changes into pairs of delete and create. - --M:: - Detect renames. - --C:: - Detect copies as well as renames. - ---find-copies-harder:: - 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. - --R:: - Swap two input trees. - --S:: - Look for differences that contains the change in . - ---pickaxe-all:: - When -S finds a change, show all the changes in that - changeset, not just the files that contains the change - in . - --O:: - Output the patch in the order specified in the - , which has one shell glob pattern per line. - --r:: - recurse - -t:: show tree entry itself as well as subtrees. Implies -r. --z:: - \0 line termination on output - --root:: 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. -- cgit v1.3