gitgit-rebasegit-pullgit-stashgit-revert

Undoing a git pull --rebase

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?

Solution

  • using git reflog you will see a list of commits HEAD pointed to in the past

    using

    git checkout -b after-commit HEAD@{1} # or the commit you want to recover

    you create a new branch at that precise position and check it out