Skip to content

Commit eabbc99

Browse files
committed
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 <[email protected]>
1 parent 2d0f5f3 commit eabbc99

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/git-diff-tree.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ include::diff-options.txt[]
4949
--stdin::
5050
When '--stdin' is specified, the command does not take
5151
<tree-ish> arguments from the command line. Instead, it
52-
reads either one <commit> or a pair of <tree-ish>
52+
reads either one <commit> or a list of <commit>
5353
separated with a single space from its standard input.
5454
+
5555
When a single commit is given on one line of such input, it compares
5656
the commit with its parents. The following flags further affects its
57-
behavior. This does not apply to the case where two <tree-ish>
58-
separated with a single space are given.
57+
behavior. The remaining commits, when given, are used as if they are
58+
parents of the first commit.
5959

6060
-m::
6161
By default, "git-diff-tree --stdin" does not show

0 commit comments

Comments
 (0)