X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=361eaec700bf6401f89c7e631f53414a399affe6;hb=fd2a75972e90d34bc8d4bebe1d669645557a2192;hp=af378ffcf9b09bd3ae01566e405aadec75c28e61;hpb=95a31cc5b32c5ab787e419124826ac202a00b7f5;p=git.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index af378ffcf..361eaec70 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,19 @@ 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].
 
 -p::
 	Show the change the commit introduces in a patch form.
@@ -51,7 +56,7 @@ git log v2.6.12.. include/scsi drivers/scsi::
 	Show all commits since version 'v2.6.12' that changed any file
 	in the include/scsi or drivers/scsi subdirectories
 
-git log --since="2 weeks ago" -- gitk::
+git log --since="2 weeks ago" \-- gitk::
 
 	Show the changes during the last two weeks to the file 'gitk'.
 	The "--" is necessary to avoid confusion with the *branch* named
@@ -63,6 +68,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>