Web lists-archives.com

Re: git diff: meaning of ^M at line ends ?

Am 14.05.2018 um 20:13 schrieb Torsten Bögershausen:
> ^M is the representation of a "Carriage Return" or CR.
> Under Linux/Unix/Mac OS X a line is terminated with a single
> "line feed", LF.
> Windows typically uses CRLF at the end of the line.
> "git diff" uses the LF to detect the end of line,
> leaving the CR alone.
> Nothing to worry about.
Thanks, I already suspected something like that.
Has this behavior been changed/added recently ?
I didn't observe it before, although the project I'm currently looking
into has always been using CR+LF...

Why does the ^M only show up in '+' lines ?
When changing the line end from CR+LF to LF, the diff looks like this:


But I would expect it to be



> If you want, you can commit those files with
> CRLF in the working tree, and LF in the repo.
> More information may be found here:
> https://git-scm.com/docs/gitattributes
> (Or ask more questions here, if needed)