diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-19 16:21:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-19 10:01:12 -0800 |
| commit | df2a79f4225b7216dce010ebfe41f8ad0de34b24 (patch) | |
| tree | b3ceaa28cfbc8a42c4894e308c08a0d724a5fab6 /Documentation | |
| parent | 395de250d9d9762b8ac1ce98b297d60d0b5bd643 (diff) | |
| download | git-df2a79f4225b7216dce010ebfe41f8ad0de34b24.tar.gz git-df2a79f4225b7216dce010ebfe41f8ad0de34b24.tar.xz | |
expand_user_path: expand ~ to $HOME, not to the actual homedir.
In 395de250d (Expand ~ and ~user in core.excludesfile, commit.template),
we introduced the mechanism. But expanding ~ using getpw is not what
people overriding $HOME would usually expect. In particular, git looks
for the user's .gitconfig using $HOME, so it's better to be consistent.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 958006ca7..143afb82e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -380,9 +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. "~/" and "~user/" - are expanded to the specified user's home directory. See - linkgit:gitignore[5]. + of files which are not meant to be tracked. "~/" is expanded + to the value of `$HOME` and "~user/" to the specified user's + home directory. See linkgit:gitignore[5]. core.editor:: Commands such as `commit` and `tag` that lets you edit @@ -667,7 +667,8 @@ color.ui:: commit.template:: Specify a file to use as the template for new commit messages. - "~/" and "~user/" are expanded to the specified user's home directory. + "~/" is expanded to the value of `$HOME` and "~user/" to the + specified user's home directory. diff.autorefreshindex:: When using 'git-diff' to compare with work tree |