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)
commitc7d30f8e865ad728f1b7bc487bbbdd3a49537653
treeb21b5e67c87c68efd03a12c296c358524da51725
parentada5853c98c5c0ad84a990cc6ee7365a14555c0f
parentb4af077f4cd2d15d7b2f5368b64d9c8edf89df39
Merge branch 'js/config' into pu

* js/config:
  repo-config: learn the flag "--no-local"
  Read configuration also from ~/.gitconfig
cache.h