From: Jonathan Nieder Date: Sun, 24 Aug 2008 05:38:06 +0000 (-0500) Subject: Documentation: clarify pager. configuration X-Git-Tag: v1.6.0.1~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=32818085ee88dd98c48a0838fba3c4673d5e819c;p=git.git Documentation: clarify pager. configuration It was not obvious from the text that pager. is a boolean setting. While we're changing the description, make some other improvements: lest we forget and fret, clarify that -p and pager. do not kick in when stdout is not a tty; point to related core.pager and GIT_PAGER settings; use renamed --paginate option. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 676c39bb8..167958282 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -979,9 +979,11 @@ pack.packSizeLimit:: linkgit:git-repack[1]. pager.:: - Allows to set your own pager preferences for each command, overriding - the default. If `\--pager` or `\--no-pager` is specified on the command - line, it takes precedence over this option. + Allows turning on or off pagination of the output of a + particular git subcommand when writing to a tty. If + `\--paginate` or `\--no-pager` is specified on the command line, + it takes precedence over this option. To disable pagination for + all commands, set `core.pager` or 'GIT_PAGER' to "`cat`". pull.octopus:: The default merge strategy to use when pulling multiple branches