I've forked someone's project and made some commits. I filled out a pull request, and it wasn't accepted (either the change was not desirable, or the author rewrote the functionality to be in line with "his style"). Now I'm stuck with my local fork having a few extra commits that will never get to go into upstream. I can back out the change sets, but then I have twice as many extra commits and will have to cart them around forever. It's just ugly!

What's the best way to abandon these commits that nobody wants and get my fork back to tracking upstream? I know I can delete the fork completely and re-fork it, but this is really heavy-handed and I'd lose any other work I'm doing.

git github
Edit
Report