Merge branch 'fixes'

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 056a9697c68a7de8655d6b9800e40ce3ffd92c48..db2efea14cf00335d5bb470a1b42f6cbe452c2e0 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -44,6 +44,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
 ------