X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-whatchanged.txt;h=e6f57d9bc1a318ed332c3b46a10d6de824a37a07;hb=e24317b4d093e4b148996172d0b749f09a0e6f2e;hp=8a2212de6448f50659df6e86fad2ba7d49ccb6c9;hpb=cc1621e2a02ed2a408571ed6f6ba84de2166e334;p=git.git

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 8a2212de..e6f57d9b 100644
--- 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
 ------