diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index c9ffff7..9b3d690 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -24,8 +24,45 @@ This manual page describes only the most
 
 OPTIONS
 -------
---pretty=<format>::
-	Controls the way the commit log is formatted.
+
+--
+
+--pretty[='<format>']::
+
+	Pretty-prints the details of a commit.  The default format is
+	'medium'.  If the commit is a merge, and if the pretty-format
+	is not 'oneline', 'email' or 'raw', an additional line is
+	inserted before the 'Author:' line.  This line begins with
+	"Merge: " and the sha1s of ancestral commits are printed,
+	separated by spaces.  Note that the listed commits may not
+	necessarily be the list of the *direct* parent commits if you
+	have limited your view of history: for example, if you are
+	only interested in changes related to a certain directory or
+	file.
+
+ - 'oneline'
+
+	<sha1> <title line>
+
+ - 'short'
+
+	commit <sha1>
+	Author: <author>
+	<title line>
+
+ - 'medium'
+
+	commit <sha1>
+	Author: <author>
+	Date: <date>
+	<full commit message>
+
+ - 'full'
+
+	commit <sha1>
+	Author: <author>
+	Commit: <committer>
+	<full commit message>
 
 --max-count=<n>::
 	Limits the number of commits to show.
@@ -39,6 +76,7 @@ OPTIONS
 <paths>...::
 	Show only commits that affect the specified paths.
 
+--
 
 Examples
 --------