Merge branch 'je/pager-do-not-recurse'
commitdb6fbe377075438f494dc2287b23c6e5a7437499
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:16:59 +0000 (6 11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:17:00 +0000 (6 11:17 -0700)
tree237c800b5541618db131ad4d4015e71b0ca2d03d
parente88155d1e1c3b55ed1f78425b0c2e5a09eea29dd
parentc0459ca4dc47edf5d63850a34a5f67febd966f3d
Merge branch 'je/pager-do-not-recurse'

We used to unconditionally disable the pager in the pager process
we spawn to feed out output, but that prevented people who want to
run "less" within "less" from doing so.

* je/pager-do-not-recurse:
  pager: do allow spawning pager recursively
pager.c