Merge branch 'jh/maint-config-file-prefix' into next
commit8f946edadc27f777fa12daae149079b4319ec7c6
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 06:59:58 +0000 (26 22:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 06:59:58 +0000 (26 22:59 -0800)
treef10e268c9a6640bf01925b259ee5f6f019254a14
parent29a3f53cf242ff31ef9d3c5154cb5872673eeafc
parent65807ee697a28cb30b8ad38ebb8b84cebd3f255d
Merge branch 'jh/maint-config-file-prefix' into next

* 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