Thread (33 messages) flat view 33 messages, 5 authors, 2016-06-15

Re: [PATCH/RFC v2 0/12] Re: rerere: let caller decide whether to renormalize

From: Eyvind Bernhardsen <hidden>
Date: 2016-06-15 22:49:15

Hi Jonathan,

Sorry I'm late to respond, I've just caught up with work after a long summer holiday.  It's back to working with complicated merges across normalization boundaries now, though.  This series looks like it's taking my hack in a sane direction, so for what it's worth:

Acked-by: Eyvind Bernhardsen <redacted>

Meanwhile, I've hit an annoyance: currently, files that are introduced with CRLFs on a non-normalized branch are left alone in the merged branch, causing the classical core.autocrlf problem of marking every line in such a file as changed if it is so much as touched.

I think the renormalization setting makes much more sense if the end result of the merge is normalized, so I'm working on a patch to make it do that.

- Eyvind
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help