X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-tree.txt;h=ab0ba4fb1708042bce516ed6f9e22db55672736c;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=e2a22e0869c5db73a29dd740fe089b43e104abbc;hpb=4cae1a967a99962e51777fcc950321902cce0adf;p=git.git diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index e2a22e08..ab0ba4fb 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] [-R] [-C] [-S] [-m] [-s] [-v] [-t] []\* +'git-diff-tree' [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [-t] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O] [-S] [--pickaxe-all] [...] DESCRIPTION ----------- @@ -22,29 +22,49 @@ OPTIONS :: The id of a tree object. -:: +...:: If provided, the results are limited to a subset of files matching one of these prefix strings. ie file matches `/^||.../` - 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. -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:: - Output diff in reverse. + 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 @@ -54,6 +74,10 @@ OPTIONS -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 arguments from the command line. Instead, it @@ -80,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 "=