aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-05 22:32:28 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-05 23:30:11 -0700
commiteabbc99a2198d1cae62ce951457e7edc23b5f1a9 (patch)
tree89bc12f3633cce79eef6177fa5e027153a5ca908 /Documentation
parent2d0f5f3459278475602394a7165bf8919412f4e4 (diff)
downloadgit-eabbc99a2198d1cae62ce951457e7edc23b5f1a9.tar.gz
git-eabbc99a2198d1cae62ce951457e7edc23b5f1a9.tar.xz
fix diff-tree --stdin documentation
Long time ago, the feature of "diff-tree --stdin" to take a commit and its parents on one line was broken, and did not support the common: git rev-list --parents $commits... -- $paths... | git diff-tree --stdin -v -p usage pattern by Porcelains properly. For diff-tree to talk sensibly about commits, it needs to see commits, not just trees; the code was fixed to take list of commits on the standard input in 1.2.0. However we left the documentation stale for a long time, until Karl Hasselström finally noticed it very recently. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-diff-tree.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index f4fbec48d..5d23985b5 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -49,13 +49,13 @@ 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 pair of <tree-ish>
+ reads either one <commit> or a list of <commit>
separated with a single space from its standard input.
+
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. This does not apply to the case where two <tree-ish>
-separated with a single space are given.
+behavior. The remaining commits, when given, are used as if they are
+parents of the first commit.
-m::
By default, "git-diff-tree --stdin" does not show