summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-11-04 13:00:37 (GMT)
committerJeff King <peff@peff.net>2012-11-04 13:00:38 (GMT)
commit0d2605112e25bb614d65771a04356639ab370dc3 (patch)
treebdfb13e4712ba2eea44028b419cbd820dc54061e /Documentation
parentd0c6c1758b281f64434c42955e22820738529a8c (diff)
parent3a599b832b27eca70bb2956a5a127fc35e0cb233 (diff)
downloadgit-0d2605112e25bb614d65771a04356639ab370dc3.zip
git-0d2605112e25bb614d65771a04356639ab370dc3.tar.gz
git-0d2605112e25bb614d65771a04356639ab370dc3.tar.bz2
Merge branch 'pp/maint-doc-pager-config'
* pp/maint-doc-pager-config: Documentation: improve the example of overriding LESS via core.pager
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 11f320b..9a0544c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -538,14 +538,14 @@ core.pager::
`LESS` variable to some other value. Alternately,
these settings can be overridden on a project or
global basis by setting the `core.pager` option.
- Setting `core.pager` has no affect on the `LESS`
+ Setting `core.pager` has no effect on the `LESS`
environment variable behaviour above, so if you want
to override git's default settings this way, you need
to be explicit. For example, to disable the S option
in a backward compatible manner, set `core.pager`
- to `less -+$LESS -FRX`. This will be passed to the
- shell by git, which will translate the final command to
- `LESS=FRSX less -+FRSX -FRX`.
+ to `less -+S`. This will be passed to the shell by
+ git, which will translate the final command to
+ `LESS=FRSX less -+S`.
core.whitespace::
A comma separated list of common whitespace problems to