What are these ^M's that keep showing up in my files in emacs?

git emacs newline
Neil Sarkar picture Neil Sarkar · Nov 30, 2009 · Viewed 99.8k times · Source

So I think it may have to do with textmate, but we work in a small team and are having some issues with full-file conflicts of nearly identical files in git because each line of one branch has a ^M appended to it.

What is this mysterious ^M character supposed to do, and where could it be coming from?

Our developers use emacs on Windows/Mac, TextMate on Mac, coda on Mac, and occasionally the wp-admin text editor.

Anybody ever have this issue stemming from one of those?

Answer

Josh Lee picture Josh Lee · Nov 30, 2009

In git-config, set core.autocrlf to true to make git automatically convert line endings correctly for your platform, e.g. run this command for a global setting:

git config --global core.autocrlf true

Related questions

How do I make Git use the editor of my choice for commits?

I would prefer to write my commit messages in Vim, but it is opening them in Emacs. How do I configure Git to always use Vim? Note that I want to do this globally, not just for a single project.

Read More
View a file's history in Magit?

View the change history of a file using Git versioning talks about other ways of viewing history of a file in Git. Can it be done in Emacs Magit?

Read More
Magit revert single file

The question is about Magit major mode for Emacs function and less so about how to do this via command line interface. I only have a local Git repository. How would I restore a selected file to its previous version? …

Read More