From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Nov 2016 19:23:17 +0000 (-0800)
Subject: Merge branch 'jc/setup-cleanup-fix'
X-Git-Tag: v2.11.0-rc3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c34a7daad74b0f7b0dc72de131dbb9e919b0ab32

Merge branch 'jc/setup-cleanup-fix'

"git archive" and "git mailinfo" stopped reading from local
configuration file with a recent update.

* jc/setup-cleanup-fix:
archive: read local configuration
mailinfo: read local configuration
---

c34a7daad74b0f7b0dc72de131dbb9e919b0ab32