undo git pull of wrong branch onto master

I have pulled from a different branch from the remote. The 2 branches are different yet the merge happened silently on my current branch. I am currently working on the “master” branch locally, and it has been updated with the changes of the remote branch – “FE_Changes”.

How do I remove the effects of the “FE_Changes” branch from my master branch ?

  • How can I retrieve commits in “overwritten” branch in Git?
  • Move branch to another point in history
  • How to perform merge?
  • Always ignore a certain commit on merge in git
  • How to use a subversion repository as a template for new projects?
  • Conditional Logic in django forms
  • GIT hook to prevent an experimental branch pushed to a release, or master branch
  • Fork github repository and its pull requests
  • Should I remove merged branches?
  • Why does git merge with no conflicts still produce a merge commit?
  • git submodule merge conflict: how to visualize?
  • Cloning a git-svn repository with svn metadata
  • 2 Solutions collect form web for “undo git pull of wrong branch onto master”

    git reset --hard HEAD~1

    This will nuke the most recent commit on your local branch. Assuming your pull strategy is merge, then there should only be one rogue commit on your local master branch. You mentioned that “the merge happened silently,” so this should work in your case. Once you have fixed the master branch, you may pull again, this time making sure you pull from the correct remote branch.

    In addition to Tim’s answer:
    If you want reset to a specific commit:

    git reflog

    will show you ids of all recent commits

    Then you can perform:

    git reset --hard <specific id>

    to reset to that specific commit.

    Git Baby is a git and github fan, let's start git clone.