From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Mar 2006 08:31:38 +0000 (-0800)
Subject: Merge branch 'lt/rev-list' into next
X-Git-Tag: v1.3.0-rc1~57
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6aba8fa86562c888719ccf3baf292e0151e53b20;p=git.git

Merge branch 'lt/rev-list' into next

* lt/rev-list:
  setup_revisions(): handle -n<n> and -<n> internally.
  git-log (internal): more options.
  git-log (internal): add approxidate.
  Rip out merge-order and make "git log <paths>..." work again.
  Tie it all together: "git log"
  Introduce trivial new pager.c helper infrastructure
  git-rev-list libification: rev-list walking
  Splitting rev-list into revisions lib, end of beginning.
  rev-list split: minimum fixup.
  First cut at libifying revlist generation
---

6aba8fa86562c888719ccf3baf292e0151e53b20
diff --cc Documentation/git-rev-list.txt
index 27f18e2c,5b306d65..8255ae1b
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@@ -16,9 -16,9 +16,9 @@@ SYNOPSI
  	     [ \--no-merges ]
  	     [ \--remove-empty ]
  	     [ \--all ]
- 	     [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
+ 	     [ \--topo-order ]
  	     [ \--parents ]
 -	     [ \--objects [ \--unpacked ] ]
 +	     [ [\--objects | \--objects-edge] [ \--unpacked ] ]
  	     [ \--pretty | \--header ]
  	     [ \--bisect ]
  	     <commit>... [ \-- <paths>... ]