Hi, Anders Melchiorsen wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > > > Anders Melchiorsen <mail@xxxxxxxxxxxxxxxx> writes: > > > >> Passing options to "less" with the LESS environment variable can > >> interfere with existing environment variables. [...] > >> 2. Bob sets GIT_PAGER="less -RS", but does not set LESS. Git sets > >> LESS=FRSX before calling $GIT_PAGER. Now Bob wonders why his pager is > >> not always paging, when he explicitly tried to clear the F option. > > > > 3. Christ has been happily using git with his PAGER set to "less". He > > suddenly notices that output from git linewraps and the pager does not > > exit when showing a short output, and gets very unhappy. > > Well, I noted that point already, so I had hoped for a reply > explaining why it is a big problem. Maybe setting PAGER="less" is more > common than I think, as I have never seen it. On system where less is not the default pager (e.g. Solaris), it is very common. > While I am wary of advocating a patch that makes Christ unhappy, the > "3." issue is easily fixed by him setting GIT_PAGER="less -FRSX". > > My concern is that without reading the source, it can be confusing to > figure out what happens with less, $LESS and git. So perhaps it is a documentation problem. How about this patch? -- %< -- Subject: Documentation: clarify pager configuration The unwary user may not know how to disable the -FRSX options. Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxxxxx> --- Documentation/config.txt | 9 +++++++-- Documentation/git.txt | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 9020675..88638f7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -358,8 +358,13 @@ core.editor:: `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 diff --git a/Documentation/git.txt b/Documentation/git.txt index 1bc295d..363a785 100644 --- 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 - 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' -- 1.6.0.481.g9ef3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
