Sounds fair, though you should be able to `git rebase --abort` when you get into that mode so it's not a huge deal. (I'm not 100% sure since I almost never use `git pull`; I almost always `git fetch`.)

I can see how a "rebase with auto-abort" would be helpful in some situations, though.