Merge branch 'mm/include-userpath'

The new "include.path" directive in the configuration files learned
to understand "~/path" and "~user/path".

By Jeff King
* mm/include-userpath:
  config: expand tildes in include.path variable

diff --combined Documentation/config.txt
index fb386abc514efef6cb94521c4f5546b5c51ab296,e67c8ef36908c7cb572ebdbed1e21d920b4f547b..83ad8ebce01ab0cf1af1bb1b50fd5f5b37f0f292
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -95,7 -95,9 +95,9 @@@ included file is expanded immediately, 
  found at the location of the include directive. If the value of the
  `include.path` variable is a relative path, the path is considered to be
  relative to the configuration file in which the include directive was
- found. See below for examples.
+ found. The value of `include.path` is subject to tilde expansion: `{tilde}/`
+ is expanded to the value of `$HOME`, and `{tilde}user/` to the specified
+ user's home directory. See below for examples.
  
  Example
  ~~~~~~~
@@@ -122,6 -124,7 +124,7 @@@
        [include]
                path = /path/to/foo.inc ; include by absolute path
                path = foo ; expand "foo" relative to the current file
+               path = ~/foo ; expand "foo" in your $HOME directory
  
  Variables
  ~~~~~~~~~
@@@ -138,23 -141,8 +141,23 @@@ advice.*:
  +
  --
        pushNonFastForward::
 -              Advice shown when linkgit:git-push[1] refuses
 -              non-fast-forward refs.
 +              Set this variable to 'false' if you want to disable
 +              'pushNonFFCurrent', 'pushNonFFDefault', and
 +              'pushNonFFMatching' simultaneously.
 +      pushNonFFCurrent::
 +              Advice shown when linkgit:git-push[1] fails due to a
 +              non-fast-forward update to the current branch.
 +      pushNonFFDefault::
 +              Advice to set 'push.default' to 'upstream' or 'current'
 +              when you ran linkgit:git-push[1] and pushed 'matching
 +              refs' by default (i.e. you did not provide an explicit
 +              refspec, and no 'push.default' configuration was set)
 +              and it resulted in a non-fast-forward error.
 +      pushNonFFMatching::
 +              Advice shown when you ran linkgit:git-push[1] and pushed
 +              'matching refs' explicitly (i.e. you used ':', or
 +              specified a refspec that isn't your current branch) and
 +              it resulted in a non-fast-forward error.
        statusHints::
                Directions on how to stage/unstage/add shown in the
                output of linkgit:git-status[1] and the template shown