Merge branch 'mm/include-userpath'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 00:51:27 +0000 (17:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 00:51:27 +0000 (17:51 -0700)
The new "include.path" directive in the configuration files learned
to understand "~/path" and "~user/path".

By Jeff King
* mm/include-userpath:
  config: expand tildes in include.path variable

1  2 
Documentation/config.txt

Simple merge