When I saved in Windows 7, git diff shows all the lines with ^M

Question

I used Ubuntu to upload a repository to github.

I downloaded to windows 7 and using msysgit. When I saved some files in Windows without any changes.

When I do git status, they are listed as modified.

When I do git diff, all the line has ^M at the end.

What is this ^M and how can I ignore this?

Thanks in advance.

UPDATE

I have autocrlf = false in .gitconfig, because I want to keep lf rather than auto or crlf.

score 7 · Accepted Answer · answered May 21 '11 at 11:43

7

Try to use autocrlf option in git config.

git config core.autocrlf true

answered May 21 '11 at 11:43

ceth

why 'git config core.autocrlf true' solve the problem but not 'git config --global core.autocrlf true'? – shin May 21 '11 at 12:02
--global apply to your system, without '--global' - current repository – ceth May 21 '11 at 12:09

score 3 · Answer 2 · edited May 23 '17 at 12:22

3

The ^M symbol is the Windows end-of-line encoding.

The following should fix it:

git config --global core.autocrlf true

2 Answers2