diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-08-24 00:38:06 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 12:01:28 -0700 |
| commit | 32818085ee88dd98c48a0838fba3c4673d5e819c (patch) | |
| tree | 69d925ca7658ddf9cae6c0698a2e8f3f35abd49c /Documentation | |
| parent | f5f7e4a18cf656747be8f8447ca304ddf716c742 (diff) | |
| download | git-32818085ee88dd98c48a0838fba3c4673d5e819c.tar.gz | |
Documentation: clarify pager.<cmd> configuration
It was not obvious from the text that pager.<cmd> is a boolean
setting.
While we're changing the description, make some other
improvements: lest we forget and fret, clarify that -p and
pager.<cmd> 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 <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 676c39bb84..167958282b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -979,9 +979,11 @@ pack.packSizeLimit:: linkgit:git-repack[1]. pager.<cmd>:: - 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 |