Merge branch 'fixes'

This commit is contained in:
Junio C Hamano 2005-10-16 12:21:38 -07:00
commit b71d01ef3c

View File

@ -44,6 +44,13 @@ OPTIONS
<format> can be one of 'raw', 'medium', 'short', 'full', <format> can be one of 'raw', 'medium', 'short', 'full',
and 'oneline'. 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 Author
------ ------