Commit before rebase