X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-tree.txt;h=5d6e9dc751aef6e30582b399ae09f81c043e6de1;hb=f3307deeec4b75001f543b4e7ca5a51f79a30e63;hp=9153e4cf2a1020dc9a3b5792ff3f64f7efd9f42c;hpb=521a3f676794987bfd03703fe58fbec46ed69d49;p=git.git diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 9153e4cf2..5d6e9dc75 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -32,7 +32,7 @@ include::diff-options.txt[] ...:: If provided, the results are limited to a subset of files matching one of these prefix strings. - ie file matches `/^||.../` + i.e., file matches `/^||.../` Note that this parameter does not provide any wildcard or regexp features. @@ -54,13 +54,14 @@ include::diff-options.txt[] + 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 -behaviour. This does not apply to the case where two +behavior. This does not apply to the case where two separated with a single space are given. -m:: By default, "git-diff-tree --stdin" does not show differences for merge commits. With this flag, it shows - differences to that commit from all of its parents. + differences to that commit from all of its parents. See + also '-c'. -s:: By default, "git-diff-tree --stdin" shows differences, @@ -72,28 +73,31 @@ separated with a single space are given. This flag causes "git-diff-tree --stdin" to also show the commit message before the differences. ---pretty[=(raw|medium|short)]:: - This is used to control "pretty printing" format of the - commit message. Without "=