git - Force overwrite of local file with what's in origin repo?

Question

I want to get the latest file that's in the repository, and overwrite what I have locally. How can I do this with the git client?

Answer 1

If you want to overwrite only one file:

git fetch
git checkout origin/master <filepath>

If you want to overwrite all changed files:

git fetch
git reset --hard origin/master

(This assumes that you're working on master locally and you want the changes on the origin's master - if you're on a branch, substitute that in instead.)