Merge branch 'mm/config-pathname-tilde-expand'

* 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

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc path.c
Simple merge