]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0dbc715) | patch
doc: clarify rerere-autoupdate
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Aug 2022 20:49:59 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Aug 2022 20:57:25 +0000 (13:57 -0700)
commitcb54fc93e4627d9496fff1c4ba18b1705802d069
treefc9c8216d7ab366153fb723301425e174add3d1btree
parent0dbc715ae0ccf0991d032173d86890a90bf94814commit | diff
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>
Documentation/rerere-options.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.