From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:18:34 +0000 (-0700)
Subject: Merge branch 'dk/raise-core-deltabasecachelimit'
X-Git-Tag: v2.1.0-rc0~172
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d2a274aa87d69786aa95da2f2eab88aa6b77644f?hp=-c

Merge branch 'dk/raise-core-deltabasecachelimit'

The `core.deltabasecachelimit` used to default to 16 MiB , but this
proved to be too small, and has been bumped to 96 MiB.

* dk/raise-core-deltabasecachelimit:
Bump core.deltaBaseCacheLimit to 96m
---

d2a274aa87d69786aa95da2f2eab88aa6b77644f
diff --combined Documentation/config.txt
index 9c4ceb3c27,21a3c86fa0..a33c087cb4
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -489,7 -489,7 +489,7 @@@ core.deltaBaseCacheLimit:
  	to avoid unpacking and decompressing frequently used base
  	objects multiple times.
  +
- Default is 16 MiB on all platforms.  This should be reasonable
+ Default is 96 MiB on all platforms.  This should be reasonable
  for all users/operating systems, except on the largest projects.
  You probably do not need to adjust this value.
  +
@@@ -558,19 -558,14 +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