From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:49:42 +0000 (-0700)
Subject: Merge branch 'fa/maint-config-doc'
X-Git-Tag: v1.7.11-rc0~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1652867c73a193359519ff10217c03f850a76a86;p=git.git

Merge branch 'fa/maint-config-doc'

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

1652867c73a193359519ff10217c03f850a76a86