update 2.2

Since you're becoming a GitHub master, could you also add "Killing history using git rebase" as one of your deadly skills?