From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jan 2017 21:32:07 +0000 (-0800)
Subject: Merge branch 'jk/archive-zip-userdiff-config' into maint
X-Git-Tag: v2.11.1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1e4e1782f13da2a5160b6f35fe383f1e08ad7b6;p=thirdparty%2Fgit.git

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

"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
---

b1e4e1782f13da2a5160b6f35fe383f1e08ad7b6