git absorb

git absorb is a port of Facebook's hg absorb, which is a workflow enhancement to version control that automatically folds uncommitted modifications into the appropriate draft ancestor change sets.

GitHub