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)
commit613e4e5f4046ee36f40199cbaeb9f35442d24378
tree186534e4bf0780726df7074c5e946a83bb12187a
parentc3b9325fa699dfa2562ac3748d14f082646979c2
parent57210a678a8bedd222bf4478eeb0a664d9dd5369
Merge branch 'sr/local-config'

* sr/local-config:
  config: add --local option