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

diff --cc Documentation/git-rev-list.txt
index 27f18e2c50c41710b1b4e0912577e8aa7336e46d,5b306d65933b0878ebc7623ed25a54edc979e95c..8255ae1bceee562140179704352a7e4f9cd83d99
--- 1/Documentation/git-rev-list.txt
--- 2/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>... ]

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge