Hmm, I just tried `git rebase -i` now and it worked (i.e., I was given the opportunity to squash my two commits).  I'm not sure why it didn't (seem) to work the last time.  I'll take out this extra text unless if can reproduce the issue.