[aslatter]

That is a pain, but the --update-refs argument to git-rebase helps somewhat: https://git-scm.com/docs/git-rebase#Documentation/git-rebase...