Thread (31 messages) flat view 31 messages, 10 authors, 2016-06-15

Re: mingw, windows, crlf/lf, and git

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:54

Hi,

On Tue, 13 Feb 2007, Alexander Litvinov wrote:
When I have file that was converted from dos to unix format (or from 
unix to dos) git genereta big diff. But anyway, c++ compiler works well 
with both formats and in this case I simply convert file to dos format 
and git shows again nice diff. If unix format was commited to git I 
simply change the format and commit that file again.
That's awful!
The only trouble is the rebase, it does not like \r\n ending and othen 
produce unexpected merge conflict. But I don't use rebse to othen to 
realy investigate and try to solve the problem.
Well, if everybody thinks like you, maybe we do not have to change 
anything for Windows after all?

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