Merge branch 'jh/maint-config-file-prefix' into maint
commitb0e67fffb42059cc5dca6f58c376a2ffc5fb4520
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:05 +0000 (10 13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:05 +0000 (10 13:02 -0800)
tree4008cbd4d131ffc0fc8105161f593a35f7a7691d
parent2e9d7330aaadd06d828da52f73eeda7106ba4cb4
parent65807ee697a28cb30b8ad38ebb8b84cebd3f255d
Merge branch 'jh/maint-config-file-prefix' into maint

* jh/maint-config-file-prefix:
  builtin-config: Fix crash when using "-f <relative path>" from non-root dir
builtin-config.c
t/t1300-repo-config.sh