X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=db61bc96c7e23132c41bb75724d669a6224a3d76;hb=5f54de5bd07481f6d88e8dbd5551f3356ecbf513;hp=5ec547cc0c10fb940b1bd2481940997cd375e830;hpb=4e837a98b65fbe0c83376cae5167605b771421d8;p=~andy%2Fgit

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5ec547cc0..db61bc96c 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -14,18 +14,17 @@ DESCRIPTION
 -----------
 Shows the commit logs.
 
-The command takes options applicable to the gitlink:git-rev-list[1]
+The command takes options applicable to the linkgit: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 changes
+the linkgit: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.
-
 
 OPTIONS
 -------
 
-include::pretty-options.txt[]
+:git-log: 1
+include::diff-options.txt[]
 
 -<n>::
 	Limits the number of commits to show.
@@ -36,21 +35,7 @@ include::pretty-options.txt[]
 	`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.
-
--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.
-	Cannot be combined with --reverse.
-	See also gitlink:git-reflog[1].
+	linkgit:git-rev-parse[1].
 
 --decorate::
 	Print out the ref names of any commits that are shown.
@@ -76,8 +61,11 @@ include::pretty-options.txt[]
 	Show only commits that affect the specified paths.
 
 
+include::rev-list-options.txt[]
+
 include::pretty-formats.txt[]
 
+include::diff-generate-patch.txt[]
 
 Examples
 --------
@@ -124,4 +112,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite