Undoing a git pull --rebase

git git-rebase git-pull git-stash git-revert
Thomas picture Thomas · Feb 6, 2010 · Viewed 36.3k times · Source

Hey I'm new to git and I need to undo a pull, can anyone help?!? So what I've done is...

  1. git commit
  2. git stash
  3. git pull --rebase
  4. git stash pop

this created a bunch of conflicts and went a bit wrong. Now doing 'git stash list' reveals that my stash is still there. Is it possible to revert my repo back to the point just after doing git commit. So effectively my repo only contains only changes I have made and nothing new from the server?

Answer

Pat Notz picture Pat Notz · Feb 8, 2010

Actually, to make this easier Git keeps a reference named ORIG_HEAD that points where you were before the rebase. So, it's as easy as:

git reset --hard ORIG_HEAD

Related questions

What is the difference between git pull and git fetch + git rebase?

Another question says that git pull is like a git fetch + git merge. But what is the difference between git pull and git fetch + git rebase?

Read More
Difference between git pull --rebase and git pull --ff-only

Let's say origin/master has commit A--B--C and my local/master has commit A--B--D. What will happen if I use git pull --rebase ? What will happen if I use git pull --ff-only ? Is there any difference in the resulting commit …

Read More
git rebase upstream/master vs git pull --rebase upstream master

Is there a difference between git rebase upstream/master and git pull --rebase upstream master, and if so, what? The remote could be any remote, not necessarily upstream.

Read More