Merge branch 'fixes'

diff --combined Documentation/git-whatchanged.txt
index 8a2212de6448f50659df6e86fad2ba7d49ccb6c9,db2efea14cf00335d5bb470a1b42f6cbe452c2e0..e6f57d9bc1a318ed332c3b46a10d6de824a37a07
--- 1/Documentation/git-whatchanged.txt
--- 2/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@@ -1,5 -1,6 +1,5 @@@
  git-whatchanged(1)
  ==================
 -v0.99.4, Aug 2005
  
  NAME
  ----
@@@ -8,7 -9,7 +8,7 @@@ git-whatchanged - Show logs with differ
  
  SYNOPSIS
  --------
 -'git whatchanged' <option>...
 +'git-whatchanged' <option>...
  
  DESCRIPTION
  -----------
@@@ -43,6 -44,13 +43,13 @@@ OPTION
        <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
  ------