author | Junio C Hamano <gitster@pobox.com> | |
Thu, 15 Jul 2010 19:09:14 +0000 (12:09 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 15 Jul 2010 19:09:14 +0000 (12:09 -0700) | ||
commit | 53b304224a561b5fd4ae35cedc0a978d91d4b1da | |
tree | 0d83b638b05e36452d1a49623a57908dbdf3bb78 | tree | snapshot |
parent | ea56a7ed971f3bd547abb16a3cb9a41c00133c85 | commit | diff |
parent | 030149a4dcd584f6b47221f5b087d081e582d790 | commit | diff |
Merge branch 'jn/paginate-fix'
* 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
* 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
git.c | diff1 | | diff2 | | blob | history |
t/t7006-pager.sh | diff1 | | diff2 | | blob | history |