Only new lines. I was fight with it more than an hour :/ Whenever i want to do git rebase, git returns me info that I need to add and commit changes for those two files. Git checkout -- *, git stash or any other method don't resolve problem :( I gave up...