From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:55 +0000 (-0700)
Subject: Merge branch 'nk/config-local-doc'
X-Git-Tag: v1.8.4-rc0~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=869577e5fe8d4307dd39d2751cf3c5a1896d3426;p=thirdparty%2Fgit.git

Merge branch 'nk/config-local-doc'

* nk/config-local-doc:
  config: Add description of --local option
---

869577e5fe8d4307dd39d2751cf3c5a1896d3426