Documentation: clarify pager configuration

The unwary user may not know how to disable the -FRSX options.

Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 167958282bff55ca1457a2199d9c660d3585d642..81f981509a2b9c129b31772dee5b859b3f1a2315 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -358,8 +358,13 @@ core.editor::
        `EDITOR` environment variables and then finally `vi`.
 
 core.pager::
        `EDITOR` environment variables and then finally `vi`.
 
 core.pager::

-       The command that git will use to paginate output.  Can be overridden
-       with the `GIT_PAGER` environment variable.
+       The command that git will use to paginate output.  Can
+       be overridden with the `GIT_PAGER` environment
+       variable.  Note that git sets the `LESS` environment
+       variable to `FRSX` if it is unset when it runs the
+       pager.  One can change these settings by setting the
+       `LESS` variable to some other value or by giving the
+       `core.pager` option a value such as "`less -+FRSX`".

 
 core.whitespace::
        A comma separated list of common whitespace problems to
 
 core.whitespace::
        A comma separated list of common whitespace problems to

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1bc295dd547b5375fb7c915efbc91de9130aea2c..363a785452ec13c3e8bd8bd744eb4a4db7fcc991 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -497,7 +497,8 @@ other
 'GIT_PAGER'::
        This environment variable overrides `$PAGER`. If it is set
        to an empty string or to the value "cat", git will not launch
 'GIT_PAGER'::
        This environment variable overrides `$PAGER`. If it is set
        to an empty string or to the value "cat", git will not launch

-       a pager.
+       a pager.  See also the `core.pager` option in
+       linkgit:git-config[1].

 
 'GIT_SSH'::
        If this environment variable is set then 'git-fetch'
 
 'GIT_SSH'::
        If this environment variable is set then 'git-fetch'