diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:51:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:51:36 -0800 |
| commit | d1dfc016d868322638c87a23a624651874a107c2 (patch) | |
| tree | cc2a7e259b875f5c0e72ddd26c4a430ae2b8b008 /Documentation | |
| parent | f2c0ca4fae299c2515c1554dbeec2080af5c6792 (diff) | |
| parent | 0f7fb21a7aec7ab8047536af018daa981b3b2676 (diff) | |
| download | git-d1dfc016d868322638c87a23a624651874a107c2.tar.gz git-d1dfc016d868322638c87a23a624651874a107c2.tar.xz | |
Merge branch 'mm/config-pathname-tilde-expand' into maint
* mm/config-pathname-tilde-expand:
Documentation: avoid xmlto input error
expand_user_path: expand ~ to $HOME, not to the actual homedir.
Expand ~ and ~user in core.excludesfile, commit.template
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d1e2120e1..01766b0aa 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -380,8 +380,9 @@ Common unit suffixes of 'k', 'm', or 'g' are supported. core.excludesfile:: 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. See - linkgit:gitignore[5]. + of files which are not meant to be tracked. "{tilde}/" is expanded + to the value of `$HOME` and "{tilde}user/" to the specified user's + home directory. See linkgit:gitignore[5]. core.editor:: Commands such as `commit` and `tag` that lets you edit @@ -670,6 +671,8 @@ color.ui:: commit.template:: Specify a file to use as the template for new commit messages. + "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the + specified user's home directory. diff.autorefreshindex:: When using 'git-diff' to compare with work tree |