Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next
commit474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:46:56 +0000 (19 18:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:46:56 +0000 (19 18:46 -0700)
tree1d59eb83ac03d112020646aa81d0ab2f88fa07f2
parent275fb96ae65b0886d9e6e93a421453eb6d13cb9f
parent928e47e3d50527adcfef20932f3b2764b9f11f06
parent5f1a63e0efc750c54a25644a36cf2905495a9b93
parent75c84ddb468a87006eaaa894cccf1a279a579406
Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next

* 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