In a branch, checkout file from master branch:
git checkout master -- <file> git reset HEAD <file> git commit -m "blabla"