Merge branch 'fa/maint-config-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:49:42 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:49:42 +0000 (10:49 -0700)
commit1652867c73a193359519ff10217c03f850a76a86
tree1cefbd3bd729e27ce8d88ecd3c37c5e6e429f6cd
parent302af64cc8199d86bea577f1317c31daad9417d6
parentc598c5aa01c9a6a877986ac4a99074fc65445141
Merge branch 'fa/maint-config-doc'

By Florian Achleitner
* fa/maint-config-doc:
  Documentation/git-config: describe and clarify "--local <file>" option
Documentation/git-config.txt