summaryrefslogtreecommitdiffstats
path: root/Documentation/config/rerere.txt
blob: 40abdf6a6b5d8872772991c167c879cbb63f0ce5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
rerere.autoUpdate::
	When set to true, `git-rerere` updates the index with the
	resulting contents after it cleanly resolves conflicts using
	previously recorded resolution.  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.