[firesloth]

I've been recommending making a git tag before rebasing. eg:

  git tag -f pre-rebase