For this I use: a) git add and git diff --cache b) :w and git diff (or git diff HEAD to compare a+b) c) nmap <leader>d :w !diff -u % -<CR> so that’s three d

For this I use: a) git add and git diff --cache b) :w and git diff (or git diff HEAD to compare a+b) c) nmap <leader>d :w !diff -u % -<CR> so that’s three diffs / four different stages. If I need more I also don’t refrain to use sequences of temporary commits I rework with git reset master + git add -p and/or git rebase -i So overall there’s no fear of early commitment to be had.