Try ```git rm --cached config/database.yml``` and then commiting + pushing the result.