Correct .gitignore & .gitattributes (contain commited diff markers)