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 /merge-file.c | |
parent | Merge branch 'bc/grep-i-F' into maint (diff) | |
parent | Documentation: avoid xmlto input error (diff) | |
download | tgif-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 'merge-file.c')
0 files changed, 0 insertions, 0 deletions