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