Merge branches 'jc/daemon' and 'mw/http'

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index dd46d4f05d2cdf2575cde9f0617ff1d9871172d0..674ee614c350ad7b77c1315e12d10e33ace01894 100644 (file)
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/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