diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:27:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:27:04 -0800 |
| commit | 6914c661c3652e22fc2971bfefd36fddad56233a (patch) | |
| tree | 7ea31eb6ed4e6a2fb0882f49db0c46cd19671e77 /Documentation | |
| parent | 712d352577012d5035da69bbf49ea0f0df8bb7da (diff) | |
| parent | 8c33b4cf67f47ee46fe0984751fd40c4cf7cf392 (diff) | |
| download | git-6914c661c3652e22fc2971bfefd36fddad56233a.tar.gz git-6914c661c3652e22fc2971bfefd36fddad56233a.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-var.txt | 2 | ||||
| -rw-r--r-- | Documentation/git.txt | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index bb981822a..458f3e275 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -8,7 +8,7 @@ git-var - Show a git logical variable SYNOPSIS -------- -'git var' [ -l | <variable> ] +'git var' ( -l | <variable> ) DESCRIPTION ----------- diff --git a/Documentation/git.txt b/Documentation/git.txt index cc32ce18d..98b6e1698 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 |