Git 将分支回滚到上一个提交，同时将主分支保持在它所在的位置（以及 PR 那个分支？）

Question

I'm doing some contributing on an open source project on github. The repo owner said he would prefer separate PR's for the things I'm working on. However, I had already started working on the next issue on the master branch.

So I'd like to open up a new branch, roll back that branch to where the first issue was fixed, and push that branch as a PR.

How can I do this?

Answer 1

By rebasing... and I understand you are working on master?

# let's create the new branch
git branch second master # right where your master is right now
# now let's put master where you really want it to be now
git checkout master
# if you have stuff laying around, stash it before running the next command
git reset --hard revision-where-you-want-it
# now you can force-push master so your previous PR only holds this in

# rebasing second
git rebase --onto orign/master master second # move only revisions past master

And you are done.