Try to adjust your work pattern to do many very tiny commits, maybe every few minutes, with a few-words-only commit message. Then, after a few hours, regroup us

Try to adjust your work pattern to do many very tiny commits, maybe every few minutes, with a few-words-only commit message. Then, after a few hours, regroup using “git debase -i”. (Of course before anything is being pushed where others can see it). That way you don't forget what all those tiny changes have been for... And nevertheless have a coherent description of what you did at the end of the day. When you really are working on very separate things in parallel (which you probably shouldn't), work on different branches...