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)
* 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

1  2 
Documentation/config.txt
cache.h

Simple merge
diff --cc cache.h
Simple merge