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

Question

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).

@Matt Age is not (always) relevant for deciding on duplicates, and as the linked question has more upvotes, and more detailed answers it is a good candidate. — Mark Rotteveel, Jun 09 '15 at 10:34
@MarkRotteveel I don't know, i think closing something as a duplicate retrospectively isn't logical. — Matt, Jun 09 '15 at 10:36
@Matt This is the guidance: http://meta.stackexchange.com/questions/147643/should-i-vote-to-close-a-duplicate-question-even-though-its-much-newer-and-ha/147651#147651 — Mark Rotteveel, Jun 09 '15 at 10:37
@MarkRotteveel Thanks i'll have a deeper read of that, but just glancing at the MOD answer i can see i was mistaken and this is the correct action to mark it as a duplicate and i stand corrected.... and marked as dupe — Matt, Jun 09 '15 at 10:39
Also could possibly be seen as duplicate of [Reset local repository branch to be just like remote repository HEAD](https://stackoverflow.com/q/1628088/1148030) — Peter Lamberg, Mar 31 '20 at 08:11

ma11hew28 · Accepted Answer · 2011-08-05T18:10:13.383

66

git fetch
git reset --hard origin/master

edited Aug 05 '11 at 18:10

answered Aug 01 '11 at 12:21

ma11hew28

121,420
116
450
651

4

After `git fetch`, of course. – Catherine Aug 01 '11 at 12:22
5

Note, this only works for a clean branch. Any changes or new commits in the local working copy will be lost. I've added an answer using `rebase`. – Jason McCreary Jan 20 '14 at 18:57

score 18 · Answer 2 · edited May 23 '17 at 12:25

18

With respect it is a few years old, the answer by MattDiPasquale will destroy any local changes or commits.

If you have local changes or commits, but need to rewrite history, run:

git fetch origin
git rebase origin/master

edited May 23 '17 at 12:25

Community

1
1

answered Jan 20 '14 at 19:00

Jason McCreary

71,546
23
135
174

12

If all you need to preserve is your current unstaged work (not local commits) just type `git stash && git fetch origin && git reset --hard origin/master && git stash pop` – novalore Aug 29 '14 at 09:12
Will that work if the old origin/master and your local origin master have no common root (e.g. origin history was rewritten changing all commits' SHA)? – Dan M. Jun 09 '20 at 15:58

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

2 Answers2