summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-05 06:27:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-05 06:27:04 (GMT)
commit6914c661c3652e22fc2971bfefd36fddad56233a (patch)
tree7ea31eb6ed4e6a2fb0882f49db0c46cd19671e77 /Documentation/git.txt
parent712d352577012d5035da69bbf49ea0f0df8bb7da (diff)
parent8c33b4cf67f47ee46fe0984751fd40c4cf7cf392 (diff)
downloadgit-6914c661c3652e22fc2971bfefd36fddad56233a.zip
git-6914c661c3652e22fc2971bfefd36fddad56233a.tar.gz
git-6914c661c3652e22fc2971bfefd36fddad56233a.tar.bz2
Merge branch 'jn/maint-fix-pager' into maint
* jn/maint-fix-pager: tests: Fix race condition in t7006-pager t7006-pager: if stdout is not a terminal, make a new one tests: Add tests for automatic use of pager am: Fix launching of pager git svn: Fix launching of pager git.1: Clarify the behavior of the --paginate option Make 'git var GIT_PAGER' always print the configured pager Fix 'git var' usage synopsis
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 cc32ce1..98b6e16 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -230,7 +230,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.
@@ -402,7 +405,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