X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-log.txt;h=c213bdbdc500b1117805bc84cb2a0f31eeff3bcd;hb=443938df7ba6ca8c5ad50b7b061ece8116496985;hp=0e6ff3182347c03a9ae9c3992fd1e8a6db2867f9;hpb=bcdfb20ae94138eac863b4c40263dc10f29917e5;p=git.git

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 0e6ff3182..c213bdbdc 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -23,9 +23,6 @@ each commit introduces are shown.
 OPTIONS
 -------
 
-:git-log: 1
-include::diff-options.txt[]
-
 -<n>::
 	Limits the number of commits to show.
 
@@ -34,8 +31,11 @@ include::diff-options.txt[]
 	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
-	linkgit:git-rev-parse[1].
+	and <until>, see linkgit:gitrevisions[1].
+
+--follow::
+	Continue listing the history of a file beyond renames
+	(works only for a single file).
 
 --no-decorate::
 --decorate[=short|full|no]::
@@ -55,9 +55,9 @@ include::diff-options.txt[]
 	paths.  With this, the full diff is shown for commits that touch
 	the specified paths; this means that "<path>..." limits only
 	commits, and doesn't limit diff for those commits.
-
---follow::
-	Continue listing the history of a file beyond renames/copies.
++
+Note that this affects all diff-based output types, e.g. those
+produced by --stat etc.
 
 --log-size::
 	Before the log message print out its size in bytes. Intended
@@ -72,6 +72,11 @@ include::diff-options.txt[]
 	to be prefixed with "\-- " to separate them from options or
 	refnames.
 
+Common diff options
+~~~~~~~~~~~~~~~~~~~
+
+:git-log: 1
+include::diff-options.txt[]
 
 include::rev-list-options.txt[]