Merge branch 'maint'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b8029463d9e9b356d3b263f50b3eab2012956ee6..49bb539dea6ad86fa8844cf6bbe27a74af41b4e4 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.
@@ -38,9 +38,19 @@ include::pretty-formats.txt[]
        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.
 
+-g, \--walk-reflogs::
+       Show commits as they were recorded in the reflog. The log contains
+       a record about how the tip of a reference was changed.
+       See also gitlink:git-reflog[1].
+
 <paths>...::
        Show only commits that affect the specified paths.