diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:12 -0800 |
| commit | 0f650e1479c99e21ffb11bb5906a3abe55081a9b (patch) | |
| tree | 80e100f0edef52e3449eec4634e47d041c94c53d /color.h | |
| parent | Merge branch 'dt/disable-bitmap-in-auto-gc' (diff) | |
| parent | archive-zip: load userdiff config (diff) | |
| download | tgif-0f650e1479c99e21ffb11bb5906a3abe55081a9b.tar.xz | |
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
Diffstat (limited to 'color.h')
0 files changed, 0 insertions, 0 deletions