summaryrefslogtreecommitdiff
path: root/commit-graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-03 13:49:59 -0700
committerJunio C Hamano <gitster@pobox.com>2022-08-03 13:57:25 -0700
commitcb54fc93e4627d9496fff1c4ba18b1705802d069 (patch)
treefc9c8216d7ab366153fb723301425e174add3d1b /commit-graph.c
parent0dbc715ae0ccf0991d032173d86890a90bf94814 (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>
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions