Merge branch 'fa/maint-config-doc' into next
commit54cc47838db099b2606760774b1b1af81a00c918
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2012 18:01:41 +0000 (8 11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2012 18:01:41 +0000 (8 11:01 -0700)
tree2ae792c0718e9c39c1125ccb89e5d6749dc7a801
parentb9a6cad861e5ca61c7e539e8b31ee0d14f5551a5
parentc598c5aa01c9a6a877986ac4a99074fc65445141
Merge branch 'fa/maint-config-doc' into next

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