git pull analogous to / opposite of git push -f?

git git-push git-pull git-fetch
ma11hew28 picture ma11hew28 · Aug 1, 2011 · Viewed 8.3k times · Source

Sometimes, esp. when I'm the only one working on a remote repository, I like rewriting the history with git rebase -i and git push origin master -f.

How do I do a forced git pull origin master without a merge? I tried it with the -f option, but that didn't work. I just want to rewrite the history of my local git repo to match that of the remote (origin).

Answer

ma11hew28 picture ma11hew28 · Aug 1, 2011 
git fetch
git reset --hard origin/master

Related questions

pull-only repo's 'git status' saying the branch is ahead of origin/master. Why?

So here's the situation: $ git status # On branch master # Your branch is ahead of 'origin/master' by [x] commits. # There are several questions about this on SO already, but none seem to specifically address the type of scenario I have. …

Read More
git push rejected: error: failed to push some refs

I know people have asked similar questions, but I believe the causes of their problems to be different. I did a hard reset because I had messed up my code pretty bad git reset --hard 41651df8fc9 I've made quite …

Read More
Push branches to Git

I have a local repository I'm working on and its remote is hosted on GitHub. I recently created a branch and started working on it, making several commits and now wish to push the branch to GitHub and be able …

Read More