summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-20 01:46:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-20 01:46:56 (GMT)
commit474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9 (patch)
tree1d59eb83ac03d112020646aa81d0ab2f88fa07f2
parent275fb96ae65b0886d9e6e93a421453eb6d13cb9f (diff)
parent928e47e3d50527adcfef20932f3b2764b9f11f06 (diff)
parent5f1a63e0efc750c54a25644a36cf2905495a9b93 (diff)
parent75c84ddb468a87006eaaa894cccf1a279a579406 (diff)
downloadgit-474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9.zip
git-474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9.tar.gz
git-474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9.tar.bz2
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