From: Junio C Hamano <junkio@cox.net>
Date: Tue, 20 Jun 2006 01:46:56 +0000 (-0700)
Subject: Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next
X-Git-Tag: v1.4.1-rc1~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9;p=git.git

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
---

474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9