author | Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | |
Fri, 2 Jul 2010 19:20:49 +0000 (21:20 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 2 Jul 2010 22:45:18 +0000 (15:45 -0700) | ||
commit | 43dd2332853b2460a5252b0f43d8de3c5b545b9a | |
tree | 320c3580a8f16d83c76fb49492f988e3ae4f7c3f | tree | snapshot |
parent | 331a1838b26c3032bec27b66307a9de9b3b11509 | commit | diff |
Don't expand CRLFs when normalizing text during merge
Disable CRLF expansion when convert_to_working_tree() is called from
normalize_buffer(). This improves performance when merging branches
with conflicting line endings when core.eol=crlf or core.autocrlf=true
by making the normalization act as if core.eol=lf.
Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Disable CRLF expansion when convert_to_working_tree() is called from
normalize_buffer(). This improves performance when merging branches
with conflicting line endings when core.eol=crlf or core.autocrlf=true
by making the normalization act as if core.eol=lf.
Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
convert.c | diff | blob | history |