Merge branch 'jc/setup-cleanup-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2016 19:23:17 +0000 (11:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2016 19:23:17 +0000 (11:23 -0800)
commitc34a7daad74b0f7b0dc72de131dbb9e919b0ab32
tree1d2770d0c868cc2be228028e4865724cb860e48d
parent6a2b569c2fec49cc213e0218f1251749771044d6
parenteb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0
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