In my workflow I try to use the index (staging area) and last commit efficiently. Very often I will commit something partially working with a “work in progress” commit message to tell myself that I am not done. As I work I will git commit --amend to that commit.