Merge branch 'maint-1.5.1' into maint

[git.git] / Documentation / git-log.txt

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index dd06527a1e1b421ca867fa8bca0c36ccb75aeea6..0f353f6558e5843b1534f4cb9acd75746c313510 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -25,7 +25,7 @@ This manual page describes only the most frequently used options.
 OPTIONS
 -------
 
-include::pretty-formats.txt[]
+include::pretty-options.txt[]
 
 -<n>::
        Limits the number of commits to show.
@@ -58,6 +58,9 @@ include::pretty-formats.txt[]
        Show only commits that affect the specified paths.
 
 
+include::pretty-formats.txt[]
+
+
 Examples
 --------
 git log --no-merges::