summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Patrick Palka <patrick@parcs.ath.cx>2012-10-28 16:12:46 -0400
committerLibravatar Jeff King <peff@peff.net>2012-10-29 02:27:13 -0400
commit3a599b832b27eca70bb2956a5a127fc35e0cb233 (patch)
tree8b85b65622692575bb4d72308ced0188cb41fa89
parentGit 1.7.12.4 (diff)
downloadtgif-3a599b832b27eca70bb2956a5a127fc35e0cb233.tar.xz
Documentation: improve the example of overriding LESS via core.pager
You can override an option set in the LESS variable by simply prefixing the command line option with `-+`. This is more robust than the previous example if the default LESS options are to ever change. Signed-off-by: Patrick Palka <patrick@parcs.ath.cx> Signed-off-by: Jeff King <peff@peff.net>
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 122e3c4996..789abe75de 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