Commands

git rerere

git rerere [forget <path> | diff | status]

Risk: Safe

What it does

Remembers how you fixed a conflict and replays the fix next time.

When to use it

When you rebase often and the same conflicts keep coming back.

Example

$ git config --global rerere.enabled true

$ git rerere forget index.html

Learn it in: rerere and range-diff · Official docs