Merge branch 'fa/maint-config-doc'

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

Junio C Hamano committed May 10, 2012 at 10:49 UTC 1652867c73a193359519ff10217c03f850a76a86

No changes.