| commit | 0f650e1479c99e21ffb11bb5906a3abe55081a9b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jan 2017 23:12:12 +0000 (18 15:12 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jan 2017 23:12:12 +0000 (18 15:12 -0800) | ||
| tree | 80e100f0edef52e3449eec4634e47d041c94c53d | treesnapshot (tar.gz zip) |
| parent | cf417e2c1f50578d8f7eccb65b981042d05939f0 | commitdiff |
| parent | 965cba2e7ee9b272a35d66a11f0a7bf544aa727a | commitdiff |
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
"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