HEX
Server: Apache/2.4.46 (Win64) OpenSSL/1.1.1j PHP/8.4.25
System: Windows NT DESKTOP-4TAV2RJ 10.0 build 19045 (Windows 10) AMD64
User: fred (0)
PHP: 8.4.25
Disabled: NONE
Upload Files
File: C:/Program Files/Git/mingw64/share/doc/git-doc/rerere-options.adoc
`--rerere-autoupdate`::
`--no-rerere-autoupdate`::
	After the rerere mechanism reuses a recorded resolution on
	the current conflict to update the files in the working
	tree, allow it to also update the index with the result of
	resolution.  `--no-rerere-autoupdate` is a good way to
	double-check what `rerere` did and catch potential
	mismerges, before committing the result to the index with a
	separate `git add`.