[PATCH] Unify Makefile indentation

[git.git] / Documentation / git-diff-tree.txt

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index ab0ba4f..5ccf0ba 100644 (file)
--- 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
 --------
 
 SYNOPSIS
 --------

-'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>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -19,6 +19,8 @@ Note that "git-diff-tree" can use the tree encapsulated in a commit object.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

+include::diff-options.txt[]
+

 <tree-ish>::
        The id of a tree object.
 
 <tree-ish>::
        The id of a tree object.
 


@@ -29,51 +31,9 @@ OPTIONS
        Note that this parameter does not provide any wildcard or regexp
        features.
 
        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<string>::
-       Look for differences that contains the change in <string>.
-
---pickaxe-all::
-       When -S finds a change, show all the changes in that
-       changeset, not just the files that contains the change
-       in <string>.
-
--O<orderfile>::
-       Output the patch in the order specified in the
-       <orderfile>, which has one shell glob pattern per line.
-
--r::
-       recurse
-

 -t::
        show tree entry itself as well as subtrees.  Implies -r.
 
 -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.
 --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.


@@ -126,7 +86,7 @@ Or if you are searching for what changed in just `kernel/sched.c`, just do
 and it will ignore all differences to other files.
 
 The pattern is always the prefix, and is matched exactly.  There are no
 and it will ignore all differences to other files.
 
 The pattern is always the prefix, and is matched exactly.  There are no

-wildcards.  Even stricter, it has to match complete path comonent.
+wildcards.  Even stricter, it has to match a complete path component.

 I.e. "foo" does not pick up `foobar.h`.  "foo" does match `foo/bar.h`
 so it can be used to name subdirectories.
 
 I.e. "foo" does not pick up `foobar.h`.  "foo" does match `foo/bar.h`
 so it can be used to name subdirectories.