diff options
| author |  Jeff King <peff@peff.net> | 2012-11-04 08:00:37 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-04 08:00:38 -0500 |
| commit | 0d2605112e25bb614d65771a04356639ab370dc3 (patch) | |
| tree | bdfb13e4712ba2eea44028b419cbd820dc54061e | |
| parent | Merge branch 'km/maint-doc-git-reset' (diff) | |
| parent | Documentation: improve the example of overriding LESS via core.pager (diff) | |
| download | tgif-0d2605112e25bb614d65771a04356639ab370dc3.tar.xz | |
Merge branch 'pp/maint-doc-pager-config'
* pp/maint-doc-pager-config:
Documentation: improve the example of overriding LESS via core.pager
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 11f320b962..9a0544cf1f 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 |