commit before rebase