Rewriting history

I can apply my penguin changes onto the master branch and publish that:

Then I can rebase the foozles branch onto the master:

Git will notice that p1 and p2 have already been applied to the master, and skip them

The two branches end up at the same tree, but we got there differently