From: Junio C Hamano Date: Wed, 6 Aug 2008 20:50:42 +0000 (-0700) Subject: Sync with 1.5.6.5 X-Git-Tag: v1.6.0-rc2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f44bc33c7283c19a86797ffdaafd22a19bbdfbd6;p=git.git Sync with 1.5.6.5 --- f44bc33c7283c19a86797ffdaafd22a19bbdfbd6 diff --cc Documentation/git-diff-tree.txt index 8c8f35b7a,5d23985b5..1fdf20dcc --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@@ -54,11 -54,11 +54,11 @@@ 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 - behavior. This does not apply to the case where two - 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 + 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. See also '-c'.