Autogenerated HTML docs for v1.3.0-rc3-g5910

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 508d336c98419f784cf43cda9ca891815f7a50a6..f616fd6ed75bf44fd61cafd66a249a534361cdb2 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -531,7 +531,8 @@ separated with a single space are given.</p>
 <p>\r
         By default, "git-diff-tree --stdin" does not show\r
         differences for merge commits.  With this flag, it shows\r
-        differences to that commit from all of its parents.\r
+        differences to that commit from all of its parents. See\r
+        also <em>-c</em>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -574,22 +575,33 @@ separated with a single space are given.</p>
 </p>\r
 </dd>\r
 <dt>\r
--c,--cc\r
+-c\r
 </dt>\r
 <dd>\r
 <p>\r
-        These flags change the way a merge commit is displayed\r
+        This flag changes the way a merge commit is displayed\r
         (which means it is useful only when the command is given\r
         one &lt;tree-ish&gt;, or <em>--stdin</em>).  It shows the differences\r
-        from each of the parents to the merge result\r
-        simultaneously, instead of showing pairwise diff between\r
-        a parent and the result one at a time, which <em>-m</em> option\r
-        output does.  <em>--cc</em> further compresses the output by\r
-        omiting hunks that show differences from only one\r
+        from each of the parents to the merge result simultaneously\r
+        instead of showing pairwise diff between a parent and the\r
+        result one at a time (which is what the <em>-m</em> option does).\r
+        Furthermore, it lists only files which were modified\r
+        from all parents.\r
+</p>\r
+</dd>\r
+<dt>\r
+-cc\r
+</dt>\r
+<dd>\r
+<p>\r
+        This flag changes the way a merge commit patch is displayed,\r
+        in a similar way to the <em>-c</em> option. It implies the <em>-c</em>\r
+        and <em>-p</em> options and further compresses the patch output\r
+        by omitting hunks that show differences from only one\r
         parent, or show the same change from all but one parent\r
         for an Octopus merge.  When this optimization makes all\r
         hunks disappear, the commit itself and the commit log\r
-        message is not shown, just like any other "empty diff" cases.\r
+        message is not shown, just like in any other "empty diff" case.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -964,7 +976,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-Apr-2006 21:43:20 UTC\r
+Last updated 10-Apr-2006 23:46:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index 9153e4cf2a1020dc9a3b5792ff3f64f7efd9f42c..2169169850da89283027778f47a40090bb6acfde 100644 (file)
--- a/git-diff-tree.txt
+++ b/git-diff-tree.txt
@@ -60,7 +60,8 @@ 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,
@@ -81,19 +82,25 @@ separated with a single space are given.
        git-diff-tree outputs a line with the commit ID when
        applicable.  This flag suppressed the commit ID output.
 
--c,--cc::
-       These flags change the way a merge commit is displayed
+-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 '--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
+       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 '-m' option does).
+       Furthermore, it lists only files which were modified
+       from all parents.
+
+-cc::
+       This flag changes the way a merge commit patch is displayed,
+       in a similar way to the '-c' option. It implies the '-c'
+       and '-p' 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 any other "empty diff" cases.
+       message is not shown, just like in any other "empty diff" case.
 
 --always::
        Show the commit itself and the commit log message even