From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2017 23:12:12 +0000 (-0800)
Subject: Merge branch 'jk/archive-zip-userdiff-config'
X-Git-Tag: v2.12.0-rc0~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f650e1479c99e21ffb11bb5906a3abe55081a9b;p=thirdparty%2Fgit.git

Merge branch 'jk/archive-zip-userdiff-config'

"git archive" did not read the standard configuration files, and
failed to notice a file that is marked as binary via the userdiff
driver configuration.

* jk/archive-zip-userdiff-config:
  archive-zip: load userdiff config
---

0f650e1479c99e21ffb11bb5906a3abe55081a9b