aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-08 11:24:14 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-08 11:24:14 -0800
commit23778ae9a08e9324f03898760b9e20b6b2dd6e23 (patch)
tree28f32b1e276fe01fdce276aff27f69a4b106319e /Documentation/config.txt
parent5e826019ef48e1d324c9a1866ed65f5be8990998 (diff)
parent9bad7233699e1fcf58e75f1e163499ec24680826 (diff)
downloadgit-23778ae9a08e9324f03898760b9e20b6b2dd6e23.tar.gz
git-23778ae9a08e9324f03898760b9e20b6b2dd6e23.tar.xz
Merge branch 'jk/pager-per-command'
* jk/pager-per-command: allow command-specific pagers in pager.<cmd>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ad5eb5f21..0f8579331 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1545,11 +1545,13 @@ pack.packSizeLimit::
supported.
pager.<cmd>::
- 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`.
+ If the value is boolean, turns on or off pagination of the
+ output of a particular git subcommand when writing to a tty.
+ Otherwise, turns on pagination for the subcommand using the
+ pager specified by the value of `pager.<cmd>`. 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`.
pretty.<name>::
Alias for a --pretty= format string, as specified in