| commit | 1ac0ce4d32ab7a3546e7e84a562625576208c7db | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 May 2018 06:59:22 +0000 (8 15:59 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 May 2018 06:59:22 +0000 (8 15:59 +0900) | ||
| tree | 23ebffb680b2fe7b69453bb55d8170f69d767a69 | treesnapshot (tar.gz zip) |
| parent | 7d7d051c5e2b9f70adfe5538bd9ccbf60f35d4be | commitdiff |
| parent | e92d6225361eba5ff34696122d1491dc7ace2a5a | commitdiff |
Merge branch 'ls/checkout-encoding'
The new "checkout-encoding" attribute can ask Git to convert the
contents to the specified encoding when checking out to the working
tree (and the other way around when checking in).
* ls/checkout-encoding:
convert: add round trip check based on 'core.checkRoundtripEncoding'
convert: add tracing for 'working-tree-encoding' attribute
convert: check for detectable errors in UTF encodings
convert: add 'working-tree-encoding' attribute
utf8: add function to detect a missing UTF-16/32 BOM
utf8: add function to detect prohibited UTF-16/32 BOM
utf8: teach same_encoding() alternative UTF encoding names
strbuf: add a case insensitive starts_with()
strbuf: add xstrdup_toupper()
strbuf: remove unnecessary NUL assignment in xstrdup_tolower()
The new "checkout-encoding" attribute can ask Git to convert the
contents to the specified encoding when checking out to the working
tree (and the other way around when checking in).
* ls/checkout-encoding:
convert: add round trip check based on 'core.checkRoundtripEncoding'
convert: add tracing for 'working-tree-encoding' attribute
convert: check for detectable errors in UTF encodings
convert: add 'working-tree-encoding' attribute
utf8: add function to detect a missing UTF-16/32 BOM
utf8: add function to detect prohibited UTF-16/32 BOM
utf8: teach same_encoding() alternative UTF encoding names
strbuf: add a case insensitive starts_with()
strbuf: add xstrdup_toupper()
strbuf: remove unnecessary NUL assignment in xstrdup_tolower()