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

I tried all suggestions with reset and reflog without any success. Restoring local history of IntelliJ resolved the problem of lost files