Make the name of a pack-file depend on the objects packed there-in.

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

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index bdc8d5a..ab0ba4f 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
 --------
-'git-diff-tree' [-p] [-r] [-z] [--stdin] [-M] [-R] [-C] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish> [<pattern>]\*
+'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>...]
 
 DESCRIPTION
 -----------
@@ -22,36 +22,62 @@ OPTIONS
 <tree-ish>::
        The id of a tree object.
 
-<pattern>::
+<path>...::
        If provided, the results are limited to a subset of files
        matching one of these prefix strings.
        ie file matches `/^<pattern1>|<pattern2>|.../`
-       Note that pattern does not provide any wildcard or regexp
+       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; implies -p, in turn implying also '-r'.
+       Detect renames.
 
 -C::
-       Detect copies as well as renames; implies -p, in turn
-       implying also '-r'.
+       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::
-       Output diff in reverse.
+       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.
+
 -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.
+
 --stdin::
        When '--stdin' is specified, the command does not take
        <tree-ish> arguments from the command line.  Instead, it
@@ -78,6 +104,11 @@ separated with a single space are given.
        This flag causes "git-diff-tree --stdin" to also show
        the commit message before the differences.
 
+--pretty[=(raw|medium|short)]::
+       This is used to control "pretty printing" format of the
+       commit message.  Without "=<style>", it defaults to
+       medium.
+
 
 Limiting Output
 ---------------