Merge 1.5.0.7 in

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index e9f746bbd4cebde9d8f5b90dd8fea6a2a610b140..030edaf305a620935840b3ffdcc0ca546d4e43da 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -16,7 +16,7 @@ Shows the commit logs.
 
 The command takes options applicable to the gitlink:git-rev-list[1]
 command to control what is shown and how, and options applicable to
-the gitlink:git-diff-tree[1] commands to control how the change
+the gitlink:git-diff-tree[1] commands to control how the changes
 each commit introduces are shown.
 
 This manual page describes only the most frequently used options.
@@ -27,13 +27,21 @@ OPTIONS
 
 include::pretty-formats.txt[]
 
---max-count=<n>::
+-<n>::
        Limits the number of commits to show.
 
 <since>..<until>::
        Show only commits between the named two commits.  When
        either <since> or <until> is omitted, it defaults to
        `HEAD`, i.e. the tip of the current branch.
+       For a more complete list of ways to spell <since>
+       and <until>, see "SPECIFYING REVISIONS" section in
+       gitlink:git-rev-parse[1].
+
+--first-parent::
+       Follow only the first parent commit upon seeing a merge
+       commit.  This  option gives a better overview of the
+       evolution of a particular branch.
 
 -p::
        Show the change the commit introduces in a patch form.