summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Lars Schneider <larsxschneider@gmail.com>2018-04-15 20:16:07 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-16 11:40:56 +0900
commit107642fe2661236f48b912480e090799e339c512 (patch)
treeb2a3da7a30edca2ef3241f87656fdeef39f6de56 /git-merge-octopus.sh
parentutf8: add function to detect a missing UTF-16/32 BOM (diff)
downloadtgif-107642fe2661236f48b912480e090799e339c512.tar.xz
convert: add 'working-tree-encoding' attribute
Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git web front ends do not visualize the content. Add an attribute to tell Git what encoding the user has defined for a given file. If the content is added to the index, then Git reencodes the content to a canonical UTF-8 representation. On checkout Git will reverse this operation. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions