1rerere.autoUpdate:: 2 When set to true, `git-rerere` updates the index with the 3 resulting contents after it cleanly resolves conflicts using 4 previously recorded resolution. Defaults to false. 5 6rerere.enabled:: 7 Activate recording of resolved conflicts, so that identical 8 conflict hunks can be resolved automatically, should they be 9 encountered again. By default, linkgit:git-rerere[1] is 10 enabled if there is an `rr-cache` directory under the 11 `$GIT_DIR`, e.g. if "rerere" was previously used in the 12 repository.