Merge branch 'fa/maint-config-doc' into maint

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

Junio C Hamano committed May 11, 2012 at 11:15 UTC 51eb3175efc4733ce20a733b7f542b7551a7a961

No changes.