How to reset master to origin/master?

Question

Can I do following in a simpler way?

git checkout origin/master
git branch -D master
git branch master
git checkout master

Answer 1

Something like:

$ git checkout master

# remember where the master was referencing to
$ git branch previous_master

# Reset master back to origin/master
$ git reset --hard origin/master

with step 2 being optional.

Answer 2

I think even VonC's answer has complexity compared to this option:

git update-ref refs/heads/master origin/master
git checkout master

git automatically logs every value of a ref (through the reflog). So after you run that command, then master@{1} refers to the previous value of master.

VonC's answer is correct, but it wastes time checkout out the old value of master into the filesystem.

If you care about orphaned objects in the repo, then you can run git gc

Answer 3

You already are the master. What you want is to remove the remote origin so git pull doesn't do anything. So

git remote rm origin

You can then add the current repository as the origin to the remote repository if you feel like it.

NB if local is ahead of remote your solution will wipe local changes!