gistfile1.txt

Dear Git experts,

The other day I had made a change to my code and committed it then realized I was in an unrelated branch; I had intended to commit the change to master.

I switched to master and attempted to merge just the errant commit (by the long hash key) from the branch but that ended up merging the entire branch into master.

I blame this faux pas on my still-ingrained Subversion mentality.

Where did I go wrong?  How should I have handled correcting the mistake?

Thanks.