For some reason 'git rebase' is getting my commits out of order. I'm rebasing 'wip' on 'main' (from which it is derived). The commits in 'wip' are in a given order, according to 'git log'. The commit in question is near the beginning. The rebase is moving that earlier commit to much later, and causing a merge conflict. It was working a short while ago -- I've been doing interactive rebase to clean up the commit messages. If I move the offending commit back to the correct place, git now complains about lots of empty commits, which makes me worried that it's about to delete a bunch of stuff. What is going on? #git