From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Aug 2008 05:32:28 +0000 (-0700)
Subject: fix diff-tree --stdin documentation
X-Git-Tag: v1.5.6.5~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eabbc99a2198d1cae62ce951457e7edc23b5f1a9;p=git.git

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>
---

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