On 14.05.18 18:08, Frank Schäfer wrote: > What does ^M at the end of lines in the output of 'git diff' mean ? > > Thanks, > Frank >
^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. 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)
