Merge branch 'jn/paginate-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:09:14 +0000 (12:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:09:14 +0000 (12:09 -0700)
* jn/paginate-fix:
git --paginate: paginate external commands again
git --paginate: do not commit pager choice too early
tests: local config file should be honored from subdirs of toplevel
t7006: test pager configuration for several git commands
t7006 (pager): introduce helper for parameterized tests

Conflicts:
t/t7006-pager.sh

No differences found