Autogenerated man pages for v1.3.0-rc3-g5910

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 3704ed0c3a36d4c75de550378972e53d505e26aa..c431b027544865b118874d5a0c9aaa5169ddc3d9 100755 (executable)
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -144,7 +144,7 @@ When a single commit is given on one line of such input, it compares the commit
 
 .TP
 \-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\&.
+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 \fI\-c\fR\&.
 
 .TP
 \-s
@@ -163,8 +163,12 @@ This is used to control "pretty printing" format of the commit message\&. Withou
 git\-diff\-tree outputs a line with the commit ID when applicable\&. This flag suppressed the commit ID output\&.
 
 .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 <tree\-ish>, or \fI\-\-stdin\fR)\&. 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 \fI\-m\fR option output does\&. \fI\-\-cc\fR 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\&.
+\-c
+This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree\-ish>, or \fI\-\-stdin\fR)\&. 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 is what the \fI\-m\fR option does)\&. Furthermore, it lists only files which were modified from all parents\&.
+
+.TP
+\-cc
+This flag changes the way a merge commit patch is displayed, in a similar way to the \fI\-c\fR option\&. It implies the \fI\-c\fR and \fI\-p\fR options and further compresses the patch output by omitting 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 in any other "empty diff" case\&.
 
 .TP
 \-\-always