From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 May 2012 18:15:53 +0000 (-0700)
Subject: Merge branch 'fa/maint-config-doc' into maint
X-Git-Tag: v1.7.10.2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51eb3175efc4733ce20a733b7f542b7551a7a961;p=git.git

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

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

51eb3175efc4733ce20a733b7f542b7551a7a961