tree 1d2770d0c868cc2be228028e4865724cb860e48d
parent 6a2b569c2fec49cc213e0218f1251749771044d6
parent eb0224c617ba6b4299f2a9f85d6c4b3b5e10abc0
author Junio C Hamano <gitster@pobox.com> 1479928997 -0800
committer Junio C Hamano <gitster@pobox.com> 1479928997 -0800

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