title: git diff - ^M characters
body: <p>I used to get <code>warnings</code> about <code>LF will be replaced by CRLF</code> when doing a <code>git commit</code>. </p>
  
  <p>I played around with <code>autocrlf</code> but setting it to <code>true</code> or <code>false</code> both caused problems. In the end, after this comment (<a href="https://stackoverflow.com/questions/5834014/lf-will-be-replaced-by-crlf-in-git-what-is-that-and-is-it-important/9094476#9094476">LF will be replaced by CRLF in git - What is that and is it important?</a>) by @Drew Noakes, I just unset it and that fixed the <code>warnings</code>. </p>
  
  <p>However, now, when I run <code>git diff</code> I get output like this:</p>
  
  <pre><code>-       original line;
  +       new line;^M
  </code></pre>
  
  <p>What's going on and is there any way of getting rid of these pesky <code>^M</code>s once and for all?</p>
  
  <p>If it helps, this is my own repo (i.e. I have complete control over the code base) and I'm on a Mac.</p>