From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 2 Feb 2006 23:50:18 +0000 (-0800)
Subject: Autogenerated HTML docs for v1.1.6-g97f5
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=1b6885b7318aaa1056c576da3463baf923f55148;p=git.git

Autogenerated HTML docs for v1.1.6-g97f5
---

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 036370e591..f44a2fc2fd 100644
--- 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
         for an Octopus merge.  When this optimization makes all
         hunks disappear, the commit itself and the commit log
-        message is not shown, unless <em>-m</em> is specified.
+        message is not shown, just like any other "empty diff" cases.
 </p>
 </dd>
 </dl>
@@ -930,7 +930,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 28-Jan-2006 02:37:53 PDT
+Last updated 02-Feb-2006 15:49:55 PDT
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index dd46d4f05d..674ee614c3 100644
--- 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