Fork of Fork of Fork, how to fix history?

I suspect the behavior here is what’s supposed to happen, but I’m trying to understand what I can do to fix this. I have a forked repository (https://github.com/xC0000005/Marlin) which was forked off another user’s fork. Lately, most of my fixes need to go back to the main repository (https://github.com/MarlinFirmware/Marlin).

When I attempt to create a PR between my repo’s bugfix-2.0.x and the great great grandparent’s, it shows the history of commits for not only my repo but the ancestors as well, instead of just what I’ve changed.  I attempted to fork just the Marlin repository, but doing so takes me back to my fork.

Is there a way to reset my repo so it points to https://github.com/MarlinFirmware/Marlin and changes I make will show only the history of my commits instead of everything that happened before? I’m sure it’s something dumb I’m doing, but I am not sure how to fix it.

It sounds like your changes are based off of changes from the descendant fork rather than the parent repo. If you want it to not include the changes from the descendant fork(s), you would have to rebase your changes onto the latest change that is in your fork from the parent repo.

So if the above is a somewhat accurate depiction, you would have to rebase your changes (represented by X) onto the last change in the parent repo (represented by B) … which also exists in your repo by the nature of how forks work. It’s a little more complicated than that, but that’s the general idea.

I hope that helps!