git: cheat sheet

Commands occasionally needed, but not frequently enough to be remembered

• Renaming a branch

      git branch -m <old_name> <new_name>

• Undo a merge
• Revert a merge