Merge branch 'jc/checkout-detached' into maint

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

diff --combined Documentation/config.txt
index 2dc3a0583bde6f5822c88d55e7d0b21670bb7693,fee44d8a4ab5f2f59baa320f9f72b004d5d5ad3c..7103172ed30c33f2c7933f530d03ce98c1e4f360
--- 1/Documentation/config.txt
--- 2/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