author | Karl Hasselström <kha@treskal.com> | |
Sun, 10 Aug 2008 16:12:58 +0000 (18:12 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 11 Aug 2008 08:35:47 +0000 (01:35 -0700) | ||
commit | 140b378d07229e3bcef0613e11aa0a04e4db3ecf | |
tree | cf495414d9322aa8a1916560f1d74ae75687faa9 | tree | snapshot |
parent | 7cccfaa2809a09cb321a5f1276c5b91a71594527 | commit | diff |
Teach git diff-tree --stdin to diff trees
When feeding trees on the command line, you can give exactly two
trees, not three nor one; --stdin now supports this "two tree" form on
its input, in addition to accepting lines with one or more commits.
When diffing trees (either specified on the command line or from the
standard input), the -s, -v, --pretty, --abbrev-commit, --encoding,
--no-commit-id, and --always options are ignored, since they do not
apply to trees; and the -m, -c, and --cc options are ignored since
they would be meaningful only with three or more trees, which is not
supported (yet).
Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When feeding trees on the command line, you can give exactly two
trees, not three nor one; --stdin now supports this "two tree" form on
its input, in addition to accepting lines with one or more commits.
When diffing trees (either specified on the command line or from the
standard input), the -s, -v, --pretty, --abbrev-commit, --encoding,
--no-commit-id, and --always options are ignored, since they do not
apply to trees; and the -m, -c, and --cc options are ignored since
they would be meaningful only with three or more trees, which is not
supported (yet).
Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-diff-tree.txt | diff | blob | history | |
builtin-diff-tree.c | diff | blob | history |