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

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index c9ffff734..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.
@@ -24,14 +24,24 @@ This manual page describes only the most frequently used options.
 
 OPTIONS
 -------
---pretty=<format>::
-	Controls the way the commit log is formatted.
 
---max-count=<n>::
+include::pretty-formats.txt[]
+
+-<n>::
 	Limits the number of commits to show.
 
 <since>..<until>::
-	Show only commits between the named two commits.
+	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.
@@ -63,6 +73,12 @@ git log -r --name-status release..test::
 	in the "release" branch, along with the list of paths
 	each commit modifies.
 
+Discussion
+----------
+
+include::i18n.txt[]
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>