Somewhat (or possibly greatly) related: Are tools like git-absorb safe/reliable? Git-absorb is a port of hg absorb: "Essentially, when your working directory

Somewhat (or possibly greatly) related: Are tools like git-absorb safe/reliable? Git-absorb is a port of hg absorb: "Essentially, when your working directory has uncommitted changes on top of draft changesets, you can run `hg absorb` and the uncommitted modifications are automagically folded ("absorbed") into the appropriate draft ancestor changesets. This is essentially doing `hg histedit` + "roll" actions without having to make a commit or manually make history modification rules." I haven't (yet) wrapped my head around the algorithm. I get that an algorithm can "recollate" a series of commits in a way that yields no commit conflicts, but that's not the same as rearranging and combining commits into a sequence of semantically coherent atomic commits. --- https://github.com/tummychow/git-absorb https://github.com/tummychow/git-absorb https://github.com/torbiak/git-autofixup https://github.com/torbiak/git-autofixup