This workflow can be yours, in 10 easy* payments: $ git stash $ git checkout stash@{0} -- ./ $ $EDITOR # pare your changes down $ make runtests # let's

This workflow can be yours, in 10 easy* payments: $ git stash $ git checkout stash@{0} -- ./ $ $EDITOR # pare your changes down $ make runtests # let's assume they pass $ git add ./ $ git commit $ git checkout stash@{0} -- ./ $ make runtests # let's assume they pass $ git add ./ $ git commit *(In case it appears otherwise, this isn't actually supposed to be a defense of Git. Originally, this was 15 steps, but I edited it into something briefer and more straightforward.)