Arrrgh.  Git is so frustrating sometimes.