The patch documenting --pretty options (oops)

Hi, folks.

I'm terribly sorry about the repost of my old patch.  I fixed it,
adding more information about the rest of the output formats and the
'Merge: ' line, but then accidentally reposted the original one.  I
hope this new version addresses your original concerns with my patch,
Junio.

-- 
epistemological humility