From: Junio C Hamano <junkio@cox.net>
Date: Sun, 16 Oct 2005 19:23:59 +0000 (-0700)
Subject: Merge branch 'fixes'
X-Git-Tag: v0.99.9~110
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f865a2ad981f72423aa1c19412ce57c543801957?hp=-c

Merge branch 'fixes'
---

f865a2ad981f72423aa1c19412ce57c543801957
diff --combined Documentation/git-whatchanged.txt
index 8a2212de64,db2efea14c..e6f57d9bc1
--- a/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
  ------