From: Junio C Hamano Date: Mon, 6 Nov 2017 04:11:22 +0000 (+0900) Subject: Merge branch 'kd/auto-col-with-pager-fix' X-Git-Tag: v2.16.0-rc0~181 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36625e219dc74bb2640e07e275fb30bffa47b4cd Merge branch 'kd/auto-col-with-pager-fix' "auto" as a value for the columnar output configuration ought to judge "is the output consumed by humans?" with the same criteria as "auto" for coloured output configuration, i.e. either the standard output stream is going to tty, or a pager is in use. We forgot the latter, which has been fixed. * kd/auto-col-with-pager-fix: column: do not include pager.c column: show auto columns when pager is active --- 36625e219dc74bb2640e07e275fb30bffa47b4cd