2 Commits

Author	SHA1	Message	Date
Junio C Hamano	cb54fc93e4	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 13:57:25 -07:00
Junio C Hamano	0dbc715ae0	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-08-03 13:47:11 -07:00