From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Sep 2012 21:21:55 +0000 (-0700)
Subject: Merge branch 'nd/log-n-doc'
X-Git-Tag: v1.8.0-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cdfb602a4e4ca6896a2e0baf0b8d4424ad2f7aa?ds=inline;hp=-c

Merge branch 'nd/log-n-doc'

* nd/log-n-doc:
doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
---

2cdfb602a4e4ca6896a2e0baf0b8d4424ad2f7aa
diff --combined Documentation/rev-list-options.txt
index 5436eba6e7,4c55939079..918c1109f2
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -8,7 -8,8 +8,8 @@@ ordering and formatting options, such a
  
  --
  
- -n 'number'::
+ -<number>::
+ -n <number>::
  --max-count=<number>::
  
  	Limit the number of commits to output.
@@@ -578,33 -579,16 +579,33 @@@ Commit Orderin
  
  By default, the commits are shown in reverse chronological order.
  
 ---topo-order::
 +--date-order::
 +	Show no parents before all of its children are shown, but
 +	otherwise show commits in the commit timestamp order.
  
 -	This option makes them appear in topological order (i.e.
 -	descendant commits are shown before their parents).
 +--topo-order::
 +	Show no parents before all of its children are shown, and
 +	avoid showing commits on multiple lines of history
 +	intermixed.
 ++
 +For example, in a commit history like this:
 ++
 +----------------------------------------------------------------
  
 ---date-order::
 +    ---1----2----4----7
 +	\	       \
 +	 3----5----6----8---
  
 -	This option is similar to '--topo-order' in the sense that no
 -	parent comes before all of its children, but otherwise things
 -	are still ordered in the commit timestamp order.
 +----------------------------------------------------------------
 ++
 +where the numbers denote the order of commit timestamps, `git
 +rev-list` and friends with `--date-order` show the commits in the
 +timestamp order: 8 7 6 5 4 3 2 1.
 ++
 +With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
 +3 1); some older commits are shown before newer ones in order to
 +avoid showing the commits from two parallel development track mixed
 +together.
  
  --reverse::
  
@@@ -636,14 -620,9 +637,14 @@@ These options are mostly targeted for p
  	Only useful with '--objects'; print the object IDs that are not
  	in packs.
  
 ---no-walk::
 +--no-walk[=(sorted|unsorted)]::
  
 -	Only show the given revs, but do not traverse their ancestors.
 +	Only show the given commits, but do not traverse their ancestors.
 +	This has no effect if a range is specified. If the argument
 +	"unsorted" is given, the commits are show in the order they were
 +	given on the command line. Otherwise (if "sorted" or no argument
 +	was given), the commits are show in reverse chronological order
 +	by commit time.
  
  --do-walk::
  
@@@ -781,7 -760,7 +782,7 @@@ options may be given. See linkgit:git-d
  
  --cc::
  
 -	This flag implies the '-c' options and further compresses the
 +	This flag implies the '-c' option and further compresses the
  	patch output by omitting uninteresting hunks whose contents in
  	the parents have only two variants and the merge result picks
  	one of them without modification.