From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:07:56 +0000 (-0700)
Subject: Merge branch 'eb/doc-log-manpage'
X-Git-Tag: v1.7.2~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/90a0f1b44b387877c0bbe427382a2988d906d968?ds=inline;hp=-c

Merge branch 'eb/doc-log-manpage'

* eb/doc-log-manpage:
Reorganize `git-log' man page to clarify common diff options.
---

90a0f1b44b387877c0bbe427382a2988d906d968
diff --combined Documentation/git-log.txt
index 8a69647f5c,c925d3675a..e970664fe1
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@@ -23,9 -23,6 +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,13 +31,12 @@@
  	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]::
  	Print out the ref names of any commits that are shown. If 'short' is
@@@ -55,9 -57,6 +56,6 @@@
  	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.
- 
  --log-size::
  	Before the log message print out its size in bytes. Intended
  	mainly for porcelain tools consumption. If git is unable to
@@@ -71,6 -70,11 +69,11 @@@
  	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[]