更改上游推送的提交

Question

I have two commits and both push upstream in master commit new and commit old. Both of them should become PRs. Commit old should do base enhancements and commit two adds a feature. Now I need to add a fix to commit old.

what I did:

$ git rebase -i <commit_before_old>

applied the fixes

$ git commit --all --amend --no-edit
$ git rebase --continue
$ git push -u orign master -f

But this doesn't change the commit_old

Answer 1

git reset --hard commit_old

apply fixes

git commit --all --amend --no-edit
git cherry-pick commit_new

resolve conflicts if needed and commit

git push -u orign master -f