Merge branch 'mm/pager-less-sans-S'

Since the very beginning of Git, we gave the LESS environment a
default value "FRSX" when we spawn "less" as the pager.  "S" (chop
long lines instead of wrapping) has been removed from this default
set of options, because it is more or less a personal taste thing,
as opposed to others that have good justifications (i.e. "R" is very
much justified because many kinds of output we produce are colored
and "FX" is justified because output we produce is often shorter
than a page).

Existing users who prefer not to see line-wrapped output may want to
set

$ git config core.pager "less -S"

to restore the traditional behaviour.  It is expected that people
find output from the most subcommands easier to read with the new
default, except for "blame" which tends to produce really long
lines.  To override the new default only for "git blame", you can do
this:

$ git config pager.blame "less -S"

* mm/pager-less-sans-S:
pager: remove 'S' from $LESS by default

diff --combined Documentation/config.txt
index 1932e9b9a2be5437dd467f91472318a5bf1bb992,f57b0e2fcf13ce23a349b011ba75486bbd171a8d..9c4ceb3c270fbc07bb6d94fc59cf14e4b0636b20
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -558,14 -558,19 +558,19 @@@ core.pager:
        configuration, then `$PAGER`, and then the default chosen at
        compile time (usually 'less').
  +
- When the `LESS` environment variable is unset, Git sets it to `FRSX`
+ When the `LESS` environment variable is unset, Git sets it to `FRX`
  (if `LESS` environment variable is set, Git does not change it at
  all).  If you want to selectively override Git's default setting
- for `LESS`, you can set `core.pager` to e.g. `less -+S`.  This will
+ for `LESS`, you can set `core.pager` to e.g. `less -S`.  This will
  be passed to the shell by Git, which will translate the final
- command to `LESS=FRSX less -+S`. The environment tells the command
- to set the `S` option to chop long lines but the command line
- resets it to the default to fold long lines.
+ command to `LESS=FRX less -S`. The environment does not set the
+ `S` option but the command line does, instructing less to truncate
+ long lines. Similarly, setting `core.pager` to `less -+F` will
+ deactivate the `F` option specified by the environment from the
+ command-line, deactivating the "quit if one screen" behavior of
+ `less`.  One can specifically activate some flags for particular
+ commands: for example, setting `pager.blame` to `less -S` enables
+ line truncation only for `git blame`.
  +
  Likewise, when the `LV` environment variable is unset, Git sets it
  to `-c`.  You can override this setting by exporting `LV` with
@@@ -1340,10 -1345,6 +1345,10 @@@ gui.diffcontext:
        Specifies how many context lines should be used in calls to diff
        made by the linkgit:git-gui[1]. The default is "5".
  
 +gui.displayuntracked::
 +      Determines if linkgit::git-gui[1] shows untracked files
 +      in the file list. The default is "true".
 +
  gui.encoding::
        Specifies the default encoding to use for displaying of
        file contents in linkgit:git-gui[1] and linkgit:gitk[1].