Skip to main content

Browse the archive

Revision 0dc9cad22d5c878d2ce6ee7b5cfffb034e34b2a0 authored by Junio C Hamano on 31 May 2024, 00:00:29 UTC, committed by Junio C Hamano on 31 May 2024, 00:00:29 UTC 
Git 2.41.2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parent s f20b96a + dbecc61
Raw File
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`.
back to top