Having the same problems. It's really annoying and makes clean commit a pain.