From: Junio C Hamano Date: Thu, 2 Feb 2006 23:50:28 +0000 (-0800) Subject: Autogenerated man pages for v1.1.6-g97f5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31c81004b16e8d3f5c004aa22bd704d3aa7e79dc;p=git.git Autogenerated man pages for v1.1.6-g97f5 --- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 762002941..32ddcc566 100755 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -156,7 +156,7 @@ git\-diff\-tree outputs a line with the commit ID when applicable\&. This flag s .TP \-c,\-\-cc -These flags change the way a merge commit is displayed (which means it is useful only when the command is given one , or \-\-stdin)\&. It shows the differences from each of the parents to the merge result simultaneously, instead of showing pairwise diff between a parent and the result one at a time, which \-m option output does\&. \-\-cc further compresses the output by omiting hunks that show differences from only one parent, or show the same change from all but one parent for an Octopus merge\&. When this optimization makes all hunks disappear, the commit itself and the commit log message is not shown, unless \-m is specified\&. +These flags change the way a merge commit is displayed (which means it is useful only when the command is given one , or \-\-stdin)\&. It shows the differences from each of the parents to the merge result simultaneously, instead of showing pairwise diff between a parent and the result one at a time, which \-m option output does\&. \-\-cc further compresses the output by omiting hunks that show differences from only one parent, or show the same change from all but one parent for an Octopus merge\&. When this optimization makes all hunks disappear, the commit itself and the commit log message is not shown, just like any other "empty diff" cases\&. .SH "LIMITING OUTPUT"