Merge branch 'js/etc-config'
authorJunio C Hamano <junkio@cox.net>
Sat, 24 Feb 2007 09:43:28 +0000 (01:43 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Feb 2007 09:43:28 +0000 (01:43 -0800)
* js/etc-config:
Make tests independent of global config files
config: read system-wide defaults from /etc/gitconfig

1  2 
Documentation/config.txt
Makefile
config.c
Simple merge
diff --cc Makefile
Simple merge
diff --cc config.c
Simple merge