title: Can not get rid of modified status in git
body: <p>Sometimes when I modify a file, and discards the changes via  <code>git checkout -- fileName </code>  Git still indicates it’s modified.  Git diff indicates every line has been removed and re-added, but, to the eye the lines appear to be the same.  When you do “git diff -w ” there is no difference. Currently I to commit these bogus changes to move forward.  How can I resolve this issue?</p>
  
  <p>I am using git  1.9.0.msysgit.0</p>
  
  <p>I suspect this is an end of line issue.  When I open a file with vi -b we see ^M indicating Carriage returns.  I am not using autocrlf because the conflicted files are only modified on Windows.  </p>
  
  <p>The command <code>git reset --hard </code> doesn’t resolve the issue.</p>
  
  <p><img src="https://i.stack.imgur.com/tApNe.png" alt="git problem"></p>