Merge branch 'fixes'

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 8a2212de6448f50659df6e86fad2ba7d49ccb6c9..e6f57d9bc1a318ed332c3b46a10d6de824a37a07 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -43,6 +43,13 @@ OPTIONS
        <format> can be one of 'raw', 'medium', 'short', 'full',
        and 'oneline'.
 
+-m::
+       By default, differences for merge commits are not shown.
+       With this flag, show differences to that commit from all
+       of its parents.
+
+       However, it is not very useful in general, although it
+       *is* useful on a file-by-file basis.
 
 Author
 ------