Merge branch 'mm/config-pathname-tilde-expand' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:51:36 +0000 (13:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:51:36 +0000 (13:51 -0800)
commitd1dfc016d868322638c87a23a624651874a107c2
treecc2a7e259b875f5c0e72ddd26c4a430ae2b8b008
parentf2c0ca4fae299c2515c1554dbeec2080af5c6792
parent0f7fb21a7aec7ab8047536af018daa981b3b2676
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
Documentation/config.txt
cache.h