From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Mar 2011 06:25:32 +0000 (-0700)
Subject: Merge branch 'mg/rev-list-n-reverse-doc'
X-Git-Tag: v1.7.5-rc0~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/06a054014b23494f5ace2699e2aaf7b35757e010?ds=inline;hp=-c

Merge branch 'mg/rev-list-n-reverse-doc'

* mg/rev-list-n-reverse-doc:
git-log.txt,rev-list-options.txt: put option blocks in proper order
git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
---

06a054014b23494f5ace2699e2aaf7b35757e010
diff --combined Documentation/git-log.txt
index 7fb842334f,c43aa438c7..2c84028838
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@@ -25,6 -25,7 +25,7 @@@ OPTION
  
  -<n>::
  	Limits the number of commits to show.
+ 	Note that this is a commit limiting option, see below.
  
  <since>..<until>::
  	Show only commits between the named two commits.  When
@@@ -72,15 -73,15 +73,15 @@@ produced by --stat etc
  	to be prefixed with "\-- " to separate them from options or
  	refnames.
  
+ include::rev-list-options.txt[]
+ 
+ include::pretty-formats.txt[]
+ 
  Common diff options
- ~~~~~~~~~~~~~~~~~~~
+ -------------------
  
  :git-log: 1
  include::diff-options.txt[]
- 
- include::rev-list-options.txt[]
- 
- include::pretty-formats.txt[]
  
  include::diff-generate-patch.txt[]
  
@@@ -181,6 -182,14 +182,6 @@@ This setting can be disabled by the `--
  overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable,
  and supplemented by the `--show-notes` option.
  
 -Author
 -------
 -Written by Linus Torvalds <torvalds@osdl.org>
 -
 -Documentation
 ---------------
 -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite