git/Documentation/git-diff-tree.txt, branch v1.6.3

Documentation: fix typos, grammar, asciidoc syntax

2008-12-20T03:37:18Z

[jc: the original patch was against master but 99% of it applied to maint; this commit splits out the part that applies only to master.] Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

Merge branch 'maint' to sync with GIT 1.6.0.6

2008-12-20T03:35:55Z

Signed-off-by: Junio C Hamano

Documentation: fix typos, grammar, asciidoc syntax

2008-12-20T03:10:46Z

Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano

Teach git diff-tree --stdin to diff trees

2008-08-11T08:35:47Z

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 Signed-off-by: Junio C Hamano

diff-tree: Note that the commit ID is printed with --stdin

2008-08-11T08:35:47Z

It's sort of already documented with the --no-commit-id command-line flag, but let's not hide important information from the user. Signed-off-by: Karl Hasselström Signed-off-by: Junio C Hamano

Sync with 1.5.6.5

2008-08-06T20:50:48Z

fix diff-tree --stdin documentation

2008-08-06T06:30:11Z

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

Documentation: clarify diff --cc

2008-08-02T06:00:42Z

The definition of an "uninteresting" hunk was not in line with reality. Signed-off-by: Junio C Hamano

Documentation: clarify diff --cc

2008-07-23T23:57:13Z

The definition of an "uninteresting" hunk was not in line with reality. Signed-off-by: Junio C Hamano

manpages: italicize git command names (which were in teletype font)

2008-07-05T18:24:40Z

The names of git commands are not meant to be entered at the commandline; they are just names. So we render them in italics, as is usual for command names in manpages. Using doit () { perl -e 'for (<>) { s/\`(git-[^\`.]*)\`/'\''\1'\''/g; print }' } for i in git*.txt config.txt diff*.txt blame*.txt fetch*.txt i18n.txt \ merge*.txt pretty*.txt pull*.txt rev*.txt urls*.txt do doit <"$i" >"$i+" && mv "$i+" "$i" done git diff . Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano