Merge branch 'fixes'

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 742005353aaab062f78036d8a1c5a86b135e5144..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
 ------
@@ -57,5 +64,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite