You might like rerere: https://git-scm.com/book/en/v2/Git-Tools-Rerere