From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 05 Jul 2022 17:49:46 GMT
Subject: Re: cherry-pick with --no-rerere-autoupdate does still rerere?
Message-ID: <xmqq4jzvla9x.fsf@gitster.g>
In-Reply-To: <1656831907.rjf3s99jhj.astroid@takeshi.none>

Matthias Beyer <mail@beyermatthias.de> writes:

> Excerpts from Junio C Hamano's message of Juli 2, 2022 9:04 pm:
>> Matthias Beyer <mail@beyermatthias.de> 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!

It is highly appreciated that you gave us an opportunity to
improving the documentation (or possibly something else) to avoid
getting other users into a similar misunderstanding.

A discussion, proposal, or a patch to improve docs and helps is
certainly welcome.