rerere

rerere.autoUpdate
When set to true, git-rerere updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolutions. Defaults to false.

rerere.enabled
Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. By default, linkgit:git-rerere[1] is enabled if there is an rr-cache directory under the $GIT_DIR, e.g. if "rerere" was previously used in the repository.

rerere.lockTimeout
The length of time, in milliseconds, to wait for the rerere lock when another process holds it, typically a background git rerere gc. Value 0 means not to wait at all; -1 means to wait indefinitely. Default is 1000 (i.e., wait for 1 second). A git rerere gc run by git maintenance run --auto or git gc --auto does not wait and does nothing while the lock is held.