New FAQ: how to recover from committing to the wrong branch?

[drphilmarshall]

Answer: first capture the commit (by starting the branch you wish you'd been on, or cheking out the right branch and cherry-picking the commit(s)). Then go back and clean up the wrong branch with git revert.