Undoing a git rebase

Question

Does anybody know how to easily undo a git rebase?

The only way that comes to mind is to go at it manually:

• git checkout the commit parent to both of t

Answer 1

What I usually do is git reset #commit_hash

to the last commit where I think rebase had no effect.

then git pull

Now your branch should match exactly like master and rebased commits should not be in it.

Now one can just cherry-pick the commits on this branch.