Merge branch 'je/pager-do-not-recurse' into maint
commite293c563b00f9adfff44676d7406d40194aff228
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:43:07 +0000 (25 11:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:43:07 +0000 (25 11:43 -0700)
tree5bd2a3402eef0d353670037319671188f0a23f13
parent9a597edc831038b8c449bd3e527ca2976e4e55a6
parentc0459ca4dc47edf5d63850a34a5f67febd966f3d
Merge branch 'je/pager-do-not-recurse' into maint

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