Merge branch 'js/config' into pu pu
authorJunio C Hamano <junkio@cox.net>
Sat, 10 Jun 2006 21:09:49 +0000 (14:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 10 Jun 2006 21:09:49 +0000 (14:09 -0700)
* js/config:
  repo-config: learn the flag "--no-local"
  Read configuration also from ~/.gitconfig

1  2 
cache.h

diff --cc cache.h
Simple merge