summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-02-14 12:02:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-15 02:23:17 (GMT)
commit06300d9753349a83212360445d241d70a46375fa (patch)
tree025c3b1067ba264a1c296c55b5562aca3851d6ae /Documentation/git.txt
parent64778d24a93ad455e5883120aef350ede20061c4 (diff)
downloadgit-06300d9753349a83212360445d241d70a46375fa.zip
git-06300d9753349a83212360445d241d70a46375fa.tar.gz
git-06300d9753349a83212360445d241d70a46375fa.tar.bz2
git.1: Clarify the behavior of the --paginate option
The --paginate option is meant to negate the effect of an explicit or implicit pager.<cmd> = false setting. Thus it turns the pager on if output is going to a terminal rather than unconditionally. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 01c4631..f26641a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -229,7 +229,10 @@ help ...`.
-p::
--paginate::
- Pipe all output into 'less' (or if set, $PAGER).
+ Pipe all output into 'less' (or if set, $PAGER) if standard
+ output is a terminal. This overrides the `pager.<cmd>`
+ configuration options (see the "Configuration Mechanism" section
+ below).
--no-pager::
Do not pipe git output into a pager.
@@ -401,7 +404,8 @@ people. Here is an example:
------------
Various commands read from the configuration file and adjust
-their operation accordingly.
+their operation accordingly. See linkgit:git-config[1] for a
+list.
Identifier Terminology