Adds support for running  after a rebase