diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:33:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:33:05 -0700 |
| commit | db8d6646786a9aa3242dc9eafbcef2e9f77ba7ab (patch) | |
| tree | 17a6a3a49f7b4fd5678b8f382747880ce49d0a20 /Documentation | |
| parent | 5939c6975aecf57c4d3f073546235253f690c297 (diff) | |
| parent | 4c0a89fcde219df8db8fdb9635ef2ef40d002a6e (diff) | |
| download | git-db8d6646786a9aa3242dc9eafbcef2e9f77ba7ab.tar.gz | |
Merge branch 'mm/include-userpath' into maint
By Jeff King
* mm/include-userpath:
config: expand tildes in include.path variable
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c081657be7..e67c8ef369 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -95,7 +95,9 @@ included file is expanded immediately, as if its contents had been 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 @@ Example [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 ~~~~~~~~~ |