From: Junio C Hamano <junkio@cox.net>
Date: Sat, 2 Jun 2007 19:05:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~173
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/86eff8c512b96ce3ee0ae5818edfa035b98cdf08?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Use =20 when rfc2047 encoding spaces.
Create a new manpage for the gitignore format, and reference it elsewhere
Documentation: robustify asciidoc GIT_VERSION replacement
---

86eff8c512b96ce3ee0ae5818edfa035b98cdf08
diff --combined Documentation/config.txt
index 3d8f03dfe5,7d9afe20f9..bb4d6e0e06
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -204,16 -204,23 +204,16 @@@ core.warnAmbiguousRefs:
  	and might match multiple refs in the .git/refs/ tree. True by default.
  
  core.compression::
 +	An integer -1..9, indicating a default compression level.
 +	-1 is the zlib default. 0 means no compression,
 +	and 1..9 are various speed/size tradeoffs, 9 being slowest.
 +
 +core.loosecompression::
  	An integer -1..9, indicating the compression level for objects that
 -	are not in a pack file. -1 is the zlib and git default. 0 means no
 +	are not in a pack file. -1 is the zlib default. 0 means no
  	compression, and 1..9 are various speed/size tradeoffs, 9 being
 -	slowest.
 -
 -core.legacyheaders::
 -	A boolean which
 -	changes the format of loose objects so that they are more
 -	efficient to pack and to send out of the repository over git
 -	native protocol, since v1.4.2.  However, loose objects
 -	written in the new format cannot be read by git older than
 -	that version; people fetching from your repository using
 -	older versions of git over dumb transports (e.g. http)
 -	will also be affected.
 -+
 -To let git use the new loose object format, you have to
 -set core.legacyheaders to false.
 +	slowest.  If not set,  defaults to core.compression.  If that is
 +	not set,  defaults to 0 (best speed).
  
  core.packedGitWindowSize::
  	Number of bytes of a pack file to map into memory in a
@@@ -259,7 -266,8 +259,8 @@@ Common unit suffixes of 'k', 'm', or 'g
  core.excludeFile::
  	In addition to '.gitignore' (per-directory) and
  	'.git/info/exclude', git looks into this file for patterns
- 	of files which are not meant to be tracked.
+ 	of files which are not meant to be tracked.  See
+ 	gitlink:gitignore[5].
  
  alias.*::
  	Command aliases for the gitlink:git[1] command wrapper - e.g.
@@@ -389,11 -397,6 +390,11 @@@ format.suffix:
  	`.patch`. Use this variable to change that suffix (make sure to
  	include the dot if you want it).
  
 +gc.aggressiveWindow::
 +	The window size parameter used in the delta compression
 +	algorithm used by 'git gc --aggressive'.  This defaults
 +	to 10.
 +
  gc.packrefs::
  	`git gc` does not run `git pack-refs` in a bare repository by
  	default so that older dumb-transport clients can still fetch
@@@ -560,13 -563,6 +561,13 @@@ pack.depth:
  	The maximum delta depth used by gitlink:git-pack-objects[1] when no
  	maximum depth is given on the command line. Defaults to 50.
  
 +pack.compression::
 +	An integer -1..9, indicating the compression level for objects
 +	in a pack file. -1 is the zlib default. 0 means no
 +	compression, and 1..9 are various speed/size tradeoffs, 9 being
 +	slowest.  If not set,  defaults to core.compression.  If that is
 +	not set,  defaults to -1.
 +
  pull.octopus::
  	The default merge strategy to use when pulling multiple branches
  	at once.