Andrew's git / gitweb.git / diff
?
Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:46:56 +0000 (18:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:46:56 +0000 (18:46 -0700)
* js/lsfix:
Initialize lock_file struct to all zero.

* pb/config:
Read configuration also from $HOME/.gitconfig
Fix setting config variables with an alternative GIT_CONFIG

* jn/web:
Make CSS file gitweb/gitweb.css more readable

Trivial merge