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)
By Florian Achleitner
* fa/maint-config-doc:
  Documentation/git-config: describe and clarify "--local <file>" option

1  2 
Documentation/git-config.txt

Simple merge