HEX
Server: Apache/2
System: Linux nexus-01 4.18.0-553.120.1.el8_10.x86_64 #1 SMP Mon Apr 20 18:04:27 EDT 2026 x86_64
User: aglcoke (1118)
PHP: 8.2.31
Disabled: mail,exec,system,passthru,shell_exec,proc_close,proc_open,dl,popen,show_source,posix_kill,posix_mkfifo,posix_getpwuid,posix_setpgid,posix_setsid,posix_setuid,posix_setgid,posix_seteuid,posix_setegid,posix_uname
$ pwd: /proc/1/task/1/root/usr/share/doc/git/
Upload Files
File: //proc/1/task/1/root/usr/share/doc/git/rerere-options.txt
--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`.
@ Telegram