Always, always, always remember to
git-rebase --continue
Or strange confusing things happen, and if you don’t have experts on hand… FAIL.
(Needless to say, the silly little typo I was trying to rebase away made it into public history after all. Poo.)
Tags: Git