Home • Explore • Blog • CI
☰



git
1st chunk of `Documentation/config/rerere.adoc`
1d281553ee9a3e2ac9aad11e2e4611ca33953da16ffbf3780000000100000207
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.
Title: Git Rerere Configuration Options
Summary
The git-rerere feature has two configuration options: autoUpdate and enabled, which control how git-rerere resolves conflicts and records resolutions for future use, allowing for automatic resolution of identical conflict hunks and updates to the index with resulting contents after clean conflict resolutions.