You made a mess with Git ? Here’s a flowchart guideline on how to fix

Extremely useful. Originally created by Justin Hileman in the presentation Changing History, or How to Git pretty. You’ll also find a printable .pdf version there. Don’t forget to tip him, especially when his flowchart has saved your life three times this week.