Forward-port local commits to the updated upstream head

--no-ff
    With --interactive, cherry-pick all rebased commits instead of fast-forwarding over the unchanged
    ones. This ensures that the entire history of the rebased branch is composed of new commits.