On 15.05.18 20:04, Frank Schäfer wrote: > 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 ? That is a good question. There is, to my knowledge, no intentional change. > I didn't observe it before, although the project I'm currently looking > into has always been using CR+LF... Do you mean that older versions did behave differently ? Do you have a version number for the "old" handling ? > > Why does the ^M only show up in '+' lines ? > When changing the line end from CR+LF to LF, the diff looks like this: > > -blahblah > +blahblah > > But I would expect it to be > > -blahblah^M > +blahblah May be this helps (I haven't tested it) ? git config core.whitespace cr-at-eol
