https://github.com/tummychow/git-absorb could be a useful tool if it works well. Experiment with it, describe it, and link it.