Autogenerated HTML docs for v1.1.6-g97f5

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 036370e5912916b514f5c3c3511536097c3292d6..f44a2fc2fdb3c82b2ec4a9968657fdcb4918db1e 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -564,7 +564,7 @@ separated with a single space are given.</p>
         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, unless <em>-m</em> is specified.\r
+        message is not shown, just like any other "empty diff" cases.\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -930,7 +930,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Jan-2006 02:37:53 PDT\r
+Last updated 02-Feb-2006 15:49:55 PDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index dd46d4f05d2cdf2575cde9f0617ff1d9871172d0..674ee614c350ad7b77c1315e12d10e33ace01894 100644 (file)
--- a/git-diff-tree.txt
+++ b/git-diff-tree.txt
@@ -93,7 +93,7 @@ separated with a single space are given.
        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.
+       message is not shown, just like any other "empty diff" cases.
 
 
 Limiting Output