Git - Restore lost commits

Question

As the team I'm on has grown, we have seen a number of situations where commits get lost due to merge mistakes.

We are working on the educational aspect already, but when this happens, what are some of the best ways in git to restore the lost commits - I've heard of using commands like git bisect and manually checking out each commit. What else is out there to help?

Answer 1

git reflog can be used to find out the commit hashes of commits that are no longer on any branch but haven't yet been gc'ed.

Answer 2

Looks like you need git fsck --lost-found