Merge branch 'jk/archive-zip-userdiff-config' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:27:31 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:27:31 +0000 (15:27 -0800)
commitac42e4958ca1477fa6f58c2ddaf57ea68d4131d5
tree2478781a7305131ada3fc0bdc29c4198cc1c8294
parent9f4e89e15d2fa2dfc0d4ed7c3b4c605a4aef9445
parent965cba2e7ee9b272a35d66a11f0a7bf544aa727a
Merge branch 'jk/archive-zip-userdiff-config' into next

"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