Merge branch 'sr/local-config'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:28:09 +0000 (23:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:28:09 +0000 (23:28 -0700)
* sr/local-config:
  config: add --local option


Trivial merge