Excerpts from Junio C Hamano's message of Juli 2, 2022 9:04 pm:
> Matthias Beyer <mail@xxxxxxxxxxxxxxxx> writes:
>
>> I just experienced a `git cherry-pick <commit> --no-rerere-autoupdate` where the
>> conflict still got automatically resolved from rerere.
>
> If I am not mistaken, this is totally expected. You told the
> command "use rerere but do not blindly accept the replayed
> resolution into the index".
Ah! After over 10 years of using git, I still missed that ("update the index" in
the manpage). I was thinking about "cherry pick this, but don't use rerere at
all".
Thanks for clearing up my confusion!
Matthias
--
Mit freundlichen Grüßen,
Kind regards,
Matthias Beyer
Attachment:
pgpwY4RRhakz8.pgp
Description: PGP signature
