Andrew's git / gitweb.git / diff
?
Merge branch 'jh/maint-config-file-prefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:05 +0000 (13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:05 +0000 (13:02 -0800)
* jh/maint-config-file-prefix:
builtin-config: Fix crash when using "-f <relative path>" from non-root dir

1  2 
builtin-config.c patch | diff1 | diff2 | blob | history
t/t1300-repo-config.sh patch | diff1 | diff2 | blob | history
diff --cc builtin-config.c
Simple merge
diff --cc t/t1300-repo-config.sh
Simple merge