Merge branch 'pb/regex' into next

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index dd46d4f05d2cdf2575cde9f0617ff1d9871172d0..9153e4cf2a1020dc9a3b5792ff3f64f7efd9f42c 100644 (file)
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -93,7 +93,11 @@ 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.
+
+--always::
+       Show the commit itself and the commit log message even
+       if the diff itself is empty.
 
 
 Limiting Output