diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-08-21 10:34:22 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-08-21 10:34:22 +0000 |
commit | 3f2f6e5d768e1e09e959ec54a26e552b5dfc4f14 (patch) | |
tree | d4d3b9e33da31ec8fb99af5d4376194ac84fbfa6 /git-diff-tree.txt | |
parent | 3580ad240fadb5ab479fd96c65350ec2b77c33bd (diff) | |
download | git-htmldocs-3f2f6e5d768e1e09e959ec54a26e552b5dfc4f14.tar.gz |
Autogenerated HTML docs for v1.6.0-90-g436ed
Diffstat (limited to 'git-diff-tree.txt')
-rw-r--r-- | git-diff-tree.txt | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 1fdf20dcc..5d48664e6 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -49,13 +49,22 @@ include::diff-options.txt[] --stdin:: When '--stdin' is specified, the command does not take <tree-ish> arguments from the command line. Instead, it - reads either one <commit> or a list of <commit> - separated with a single space from its standard input. + reads lines containing either two <tree>, one <commit>, or a + list of <commit> from its standard input. (Use a single space + as separator.) + -When a single commit is given on one line of such input, it compares -the commit with its parents. The following flags further affects its -behavior. The remaining commits, when given, are used as if they are +When two trees are given, it compares the first tree with the second. +When a single commit is given, it compares the commit with its +parents. The remaining commits, when given, are used as if they are parents of the first commit. ++ +When comparing two trees, the ID of both trees (separated by a space +and terminated by a newline) is printed before the difference. When +comparing commits, the ID of the first (or only) commit, followed by a +newline, is printed. ++ +The following flags further affects the behavior when comparing +commits (but not trees). -m:: By default, 'git-diff-tree --stdin' does not show |