Question

I have a repo that has two files that supposedly I changed locally.

So I’m stuck with this:

$ git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   dir1/foo.aspx
#       modified:   dir2/foo.aspx
#
no changes added to commit (use "git add" and/or "git commit -a")

Doing git diff says that the entire file contents have changed, even though from eyeballing it that seems untrue (there seem to be common line ranges that diff seems to be failing to see).

Interestingly I don’t remember changing these files locally. This repo is used with one remote repo (private, at GitHub.com, FWIW).

No matter what I’ve tried, I can’t discard these local changes. I have tried all of:

$ git checkout -- .
$ git checkout -f
$ git checkout -- dir1/checkout_receipt.aspx
$ git reset --hard HEAD
$ git stash save --keep-index && git stash drop
$ git checkout-index -a -f

In other words I’ve tried everything described in How do I discard unstaged changes in Git? plus more. But the 2 files remain stuck as “changed but not committed”.

What the heck would cause two files to be stuck like this and seemingly “un-revert-table”??

P.S. In the list above showing commands I’d already tried, I mistakenly wrote git revert when I meant git checkout. I’m sorry and thank you to those of you who answered that I should try checkout. I edited the question to correct it. I definitely did already try checkout.

Answer 1

What are the line endings in the files? I’m betting they’re CRLF. If they are, check out this guide: http://help.github.com/line-endings/

In short, you need to make sure git is set to convert the line endings to LF on commit, and then commit those files. Files in the repo should always be LF, files checked out should be the OS’s native, assuming you set git correctly.