[thirdparty/git.git] / Documentation / config / rerere.txt

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.
Commit	Line	Data
72622c24 NTND	1	rerere.autoUpdate::
	2	When set to true, `git-rerere` updates the index with the
	3	resulting contents after it cleanly resolves conflicts using
6cc668c0	4	previously recorded resolutions. Defaults to false.
72622c24 NTND	5
	6	rerere.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.