How can I remove my last commit in my local git repository

Posted by michael on Stack Overflow See other posts from Stack Overflow or by michael
Published on 2010-04-11T22:44:23Z Indexed on 2010/04/11 22:53 UTC
Read the original article Hit count: 155

Filed under:

Hi,

This is the output of my 'git log'. But when I do a 'git pull' , the top commit causes conflict. So I did a 'git rebase -abort'

commit 7826b25db424b95bae9105027edb7dcbf94d6e65

commit 5d1970105e8fd2c7b30c232661b93f1bcd00bc96

But my question is Can I 'save' my commit to a patch and then do a git pull?

Just like I want to emulate * I did not do a git commit, but I did a 'git stash' instead * Do a git pull so that I should not get any merge error

So I need to somehow 'turn back the clock'. Is that possible in git?

© Stack Overflow or respective owner

Related posts about git