From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Mar 2010 08:35:59 +0000 (-0800)
Subject: Merge branch 'jc/checkout-detached' into maint
X-Git-Tag: v1.7.0.3~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89cd4aa8624de4fa80469ab9ef8482f44b2cc2db?hp=-c

Merge branch 'jc/checkout-detached' into maint

* jc/checkout-detached:
Reword "detached HEAD" notification
---

89cd4aa8624de4fa80469ab9ef8482f44b2cc2db
diff --combined Documentation/config.txt
index 2dc3a0583b,fee44d8a4a..7103172ed3
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -138,6 -138,11 +138,11 @@@ advice.*:
  		Advice on how to set your identity configuration when
  		your information is guessed from the system username and
  		domain name. Default: true.
+ 
+ 	detachedHead::
+ 		Advice shown when you used linkgit::git-checkout[1] to
+ 		move to the detach HEAD state, to instruct how to create
+ 		a local branch after the fact.  Default: true.
  --
  
  core.fileMode::
@@@ -417,20 -422,6 +422,20 @@@ You probably do not need to adjust thi
  +
  Common unit suffixes of 'k', 'm', or 'g' are supported.
  
 +core.bigFileThreshold::
 +	Files larger than this size are stored deflated, without
 +	attempting delta compression.  Storing large files without
 +	delta compression avoids excessive memory usage, at the
 +	slight expense of increased disk usage.
 ++
 +Default is 512 MiB on all platforms.  This should be reasonable
 +for most projects as source code and other text files can still
 +be delta compressed, but larger binary media files won't be.
 ++
 +Common unit suffixes of 'k', 'm', or 'g' are supported.
 ++
 +Currently only linkgit:git-fast-import[1] honors this setting.
 +
  core.excludesfile::
  	In addition to '.gitignore' (per-directory) and
  	'.git/info/exclude', git looks into this file for patterns
@@@ -680,7 -671,9 +685,7 @@@ color.grep:
  
  color.grep.match::
  	Use customized color for matches.  The value of this variable
 -	may be specified as in color.branch.<slot>.  It is passed using
 -	the environment variables 'GREP_COLOR' and 'GREP_COLORS' when
 -	calling an external 'grep'.
 +	may be specified as in color.branch.<slot>.
  
  color.interactive::
  	When set to `always`, always use colors for interactive prompts
@@@ -1366,13 -1359,10 +1371,13 @@@ you can use linkgit:git-index-pack[1] o
  the `{asterisk}.idx` file.
  
  pack.packSizeLimit::
 -	The default maximum size of a pack.  This setting only affects
 -	packing to a file, i.e. the git:// protocol is unaffected.  It
 -	can be overridden by the `\--max-pack-size` option of
 -	linkgit:git-repack[1].
 +	The maximum size of a pack.  This setting only affects
 +	packing to a file when repacking, i.e. the git:// protocol
 +	is unaffected.  It can be overridden by the `\--max-pack-size`
 +	option of linkgit:git-repack[1]. The minimum size allowed is
 +	limited to 1 MiB. The default is unlimited.
 +	Common unit suffixes of 'k', 'm', or 'g' are
 +	supported.
  
  pager.<cmd>::
  	Allows turning on or off pagination of the output of a