My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf417e2
965cba2
)
Merge branch 'jk/archive-zip-userdiff-config'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Jan 2017 23:12:12 +0000
(15:12 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Jan 2017 23:12:12 +0000
(15:12 -0800)
"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
Trivial merge