From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Oct 2017 01:18:42 +0000 (+0900)
Subject: Merge branch 'sg/rev-list-doc-reorder-fix'
X-Git-Tag: v2.15.0~3
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/d8f3074c48d95877a4e82a4683b20319f2cb2328

Merge branch 'sg/rev-list-doc-reorder-fix'

Doc flow fix.

* sg/rev-list-doc-reorder-fix:
rev-list-options.txt: use correct directional reference
---

d8f3074c48d95877a4e82a4683b20319f2cb2328
diff --cc Documentation/rev-list-options.txt
index 7d860bfca1,44135d3d07..13501e1556
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -798,12 -628,14 +798,12 @@@ ifdef::git-rev-list[
  endif::git-rev-list[]
  
  --parents::
 -
  	Print also the parents of the commit (in the form "commit parent...").
- 	Also enables parent rewriting, see 'History Simplification' below.
+ 	Also enables parent rewriting, see 'History Simplification' above.
  
  --children::
 -
  	Print also the children of the commit (in the form "commit child...").
- 	Also enables parent rewriting, see 'History Simplification' below.
+ 	Also enables parent rewriting, see 'History Simplification' above.
  
  ifdef::git-rev-list[]
  --timestamp::
@@@ -844,19 -678,11 +844,19 @@@ you would get an output like this
  	on the left hand side of the output.  This may cause extra lines
  	to be printed in between commits, in order for the graph history
  	to be drawn properly.
 +	Cannot be combined with `--no-walk`.
  +
- This enables parent rewriting, see 'History Simplification' below.
+ This enables parent rewriting, see 'History Simplification' above.
  +
 -This implies the '--topo-order' option by default, but the
 -'--date-order' option may also be specified.
 +This implies the `--topo-order` option by default, but the
 +`--date-order` option may also be specified.
 +
 +--show-linear-break[=<barrier>]::
 +	When --graph is not used, all history branches are flattened
 +	which can make it hard to see that the two consecutive commits
 +	do not belong to a linear branch. This option puts a barrier
 +	in between them in that case. If `<barrier>` is specified, it
 +	is the string that will be shown instead of the default one.
  
  ifdef::git-rev-list[]
  --count::