straup/privatesquare — pull request #2 by mncaudill (2012-02-01 18:21:03+00:00)
Title: Fingers crossed

Okay, I think this is the "right" way to do this in git.

What I did was create a new branch that tracks your master and added this little branch off the top of it. I then cherry-picked the changes I wanted over to this branch. So this branch "only" contains stuff that I want to pulled in that is different than your master branch.