completely automatic: https://github.com/tummychow/git-absorb
needs manual rebase: https://github.com/torbiak/git-autofixup