[User23]

As an aside you can avoid the vast majority of unnecessary rebase tedium with proper use of

  git rebase —onto