Git-从本地和远程仓库中删除多个先前的提交

Question

This has more than likely been asked before but I've gotten myself so confused trying to find the solution that I thought it better to just post the specific problem I'm trying to resolve.

I want to completely remove the commits crossed out (see screen grab) leaving the others untouched. As you can see, these commits don't always follow each other. I have already pushed all these commits to remote so I'd need this to reflect there also. Is it possible to do this?

I'm relatively new to using Git so any advice would be great. Thanks.

Local repo commits - SourceTree screen grab

Answer 1

If you have already pushed those commits, you shouldn't delete them from history. Doing so will cause other people problems when they pull your changes.

Instead, you can use the revert command to create a new commit and removes the changes from an earlier commit. When you push this commit to the remote repository, it will have the same effect as deleting the commit, but it won't cause problems when other people pull from that repository.

To remove the most recent commit that is crossed out in your image, enter the following command:

git revert 1e3e620

Repeat this for any other commits you want to revert, and then push all of those commits to the remote repository.

Answer 2

Use git rebase -i to delete the commits, then push to remote with --force . (And deal with the upset coworkers who already pulled from the remote...)