Merge branch 'fa/maint-config-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:15:53 +0000 (11:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:15:53 +0000 (11:15 -0700)
commit51eb3175efc4733ce20a733b7f542b7551a7a961
tree157c1f8634f4cea679e906544886b581203e5c30
parent485cfd1a9214af705294ec0fd345450cca0ab16d
parentc598c5aa01c9a6a877986ac4a99074fc65445141
Merge branch 'fa/maint-config-doc' into maint

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