Undoing a pull in git

2

I have a project and at the moment I have 3 branches, master , a dev and one that I needed to create in parallel to dev for a funcionalidade part, until then without news, my problem was that I'm in the dev branch and I made a git pull origin funcionalidade and with that I downloaded everything from the functionality to the dev doing the merge, and it was not to have done that, you have to undo that pull ?     

asked by anonymous 14.07.2015 / 14:14

1 answer

5

Tried to reset? Try:

git reset --hard

If you need to reset to a specific state just say what it is:

git reset --hard hash_do_commit_aqui

This should work also in some situations:

git merge --abort

Or:

git reset --merge
    
14.07.2015 / 14:21