We use this guide often in the #git irc channel where Seth Robertson used to frequent.

It's a nice guide because sometimes people don't even know what they really want because terms like revert are overloaded.