X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-log.txt;h=db61bc96c7e23132c41bb75724d669a6224a3d76;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=7adcdefacfd681729317c59ebacfd4a27db1effd;hpb=7c851733e4bc2b36bd9df63cab2fe11180242670;p=git.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 7adcdefac..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,20 +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.
-	See also gitlink:git-reflog[1].
+	linkgit:git-rev-parse[1].
 
 --decorate::
 	Print out the ref names of any commits that are shown.
@@ -61,12 +47,25 @@ include::pretty-options.txt[]
 	the specified paths; this means that "<paths>..." limits only
 	commits, and doesn't limit diff for those commits.
 
+--follow::
+	Continue listing the history of a file beyond renames.
+
+--log-size::
+	Before the log message print out its size in bytes. Intended
+	mainly for porcelain tools consumption. If git is unable to
+	produce a valid value size is set to zero.
+	Note that only message is considered, if also a diff is shown
+	its size is not included.
+
 <paths>...::
 	Show only commits that affect the specified paths.
 
 
+include::rev-list-options.txt[]
+
 include::pretty-formats.txt[]
 
+include::diff-generate-patch.txt[]
 
 Examples
 --------
@@ -85,12 +84,18 @@ git log --since="2 weeks ago" \-- gitk::
 	The "--" is necessary to avoid confusion with the *branch* named
 	'gitk'
 
-git log -r --name-status release..test::
+git log --name-status release..test::
 
 	Show the commits that are in the "test" branch but not yet
 	in the "release" branch, along with the list of paths
 	each commit modifies.
 
+git log --follow builtin-rev-list.c::
+
+	Shows the commits that changed builtin-rev-list.c, including
+	those commits that occurred before the file was given its
+	present name.
+
 Discussion
 ----------
 
@@ -107,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