Merge branch 'mm/config-pathname-tilde-expand'
commiteb2fc8f899a58eedc87e7e8ea0fdecdc2ba9f430
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:28:38 +0000 (22 16:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:28:38 +0000 (22 16:28 -0800)
tree63d327f46a8c9d112e40efbaf85fe85a10f5530b
parent3fa384d27e79d4731a9188716f566fa423a8ff50
parent0f7fb21a7aec7ab8047536af018daa981b3b2676
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
Documentation/config.txt
builtin-commit.c
cache.h
config.c
path.c