X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-tree.txt;h=762546bfe93f2186887a815485b0003e7d6f5edb;hb=000182eacf99cde27d5916aa415921924b82972c;hp=bdc8d5a53b3bbdf8ae548c52de6f814c83a6802d;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index bdc8d5a5..762546bf 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] []\* +'git-diff-tree' [-p] [-r] [-z] [--stdin] [-B] [-M] [-R] [-C] [-O] [-S] [--pickaxe-all] [-m] [-s] [-v] [-t] []\* DESCRIPTION ----------- @@ -33,25 +33,43 @@ OPTIONS 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. -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 +-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 arguments from the command line. Instead, it