diff options
| author |  Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | 2010-07-02 21:20:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-02 15:45:18 -0700 |
| commit | 43dd2332853b2460a5252b0f43d8de3c5b545b9a (patch) | |
| tree | 320c3580a8f16d83c76fb49492f988e3ae4f7c3f /Documentation/RelNotes-1.6.1.2.txt | |
| parent | Try normalizing files to avoid delete/modify conflicts when merging (diff) | |
| download | tgif-43dd2332853b2460a5252b0f43d8de3c5b545b9a.tar.xz | |
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>
Diffstat (limited to 'Documentation/RelNotes-1.6.1.2.txt')
0 files changed, 0 insertions, 0 deletions