Merge branch 'fixes'

2005-10-16 12:23:59 -07:00 · 2005-10-16 12:23:59 -07:00 · f865a2ad98
parent a34484e1c9 15fad5f4d7
commit f865a2ad98
1 changed files with 7 additions and 0 deletions
--- 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
 ------