IMO the existing solution is to commit small changes with partial commits which is pretty easy if your editor supports them (e.g. vim-fugitive). Then prior to p

IMO the existing solution is to commit small changes with partial commits which is pretty easy if your editor supports them (e.g. vim-fugitive). Then prior to pushing your set of changes use rebase -i to reorder events into a good overall story to tell.