Server : Apache System : Linux dedi-14684855.grupobig.com 5.14.0-611.49.1.el9_7.x86_64 #1 SMP PREEMPT_DYNAMIC Tue Apr 21 16:39:08 EDT 2026 x86_64 User : grupo692 ( 1004) PHP Version : 8.3.33 Disable Function : NONE Directory :  /proc/thread-self/root/proc/thread-self/root/usr/share/doc/git/

Upload File : current_dir [ Writeable ] document_root [ Writeable ]

`--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`.