X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=030edaf305a620935840b3ffdcc0ca546d4e43da;hb=5cb71f82de7fc370dfcd7aad505c36d89e8fec5d;hp=b8029463d9e9b356d3b263f50b3eab2012956ee6;hpb=41a5564e054043945e365c580abab724e12744ff;p=git.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b8029463d..030edaf30 100644
--- 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,6 +38,11 @@ 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.