kelemen/anathema — comment on commit ca7827aad35a791e65608fa1adada707b78dbc25
File:  line 0
By UrsKR:

If you're using IDEA 10.5, this might well be the case.
There's a flag in Settings=>Version Control=>Git that controls IDEAs
behaviour in cases like this (convert, not convert, ask).

As for specifying the line endings:
If a file already has Windows endings (most files will), I'd use those so
we can keep track of changes.
If it's a new file, choose I'd leave it to git. (To my understanding, this
means it will end up with Unix endings internally and with OS-dependent
endings on our local copies).

I'd appreciate if you could recommit, but I understand if you don't want
to. I am not sure about resetting a branch that is already pushed, though.