git/Documentation/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`.
doc: consolidate --rerere-autoupdate description The `--rerere-autoupdate` option is shared across 5 commands, and are described the same way because it works exactly the same way in these commands. Create a separate file and include it from the help pages for these commands, so that we can improve the description at one place to improve all of them at once, and keep them in sync. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-07-15 21:32:18 +00:00			`--rerere-autoupdate::`
			`--no-rerere-autoupdate::`
doc: clarify rerere-autoupdate The "--[no-]rerere-autoupdate" option controls what happens _after_ the rerere mechanism kicks in to reuse recorded resolutions and does not prevent from the rerere mechanism to trigger in the first place. It is unclear in the current text if "--no-rerere-autoupdate" stops the auto-resolution. Rewrite the sentence to clarify. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-08-03 20:49:59 +00:00			`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`.