Re: [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands

From: Vegard Nossum <vegard.nossum@oracle.com>
Date: Feb 15, 2024, 14:24 UTC
Message-ID: <76c62133-30e4-4145-99ea-aeef644d617a@oracle.com>
In-Reply-To: <xmqq8r3r9biz.fsf@gitster.g>

On 11/02/2024 18:05, Junio C Hamano wrote:

Show 11 quoted lines

> Phillip Wood <phillip.wood123@gmail.com> writes:
>> On 08/02/2024 17:20, Junio C Hamano wrote:
>>> Phillip Wood <phillip.wood123@gmail.com> writes:
>> It might be worth explaining why this happens
>>
>> This is because rebase sets the GIT_CHERRY_PICK_HELP environment
>> variable to customize the advice given to users when there are
>> conflicts which causes the sequencer to remove CHERRY_PICK_HEAD.
> 
> True.  I'd prefer to see the original submitter assemble the pieces
> and come up with the final version, rather than me doing so.

Thanks for explaining and sorry for the delay. I saw the patch was merged to main now, but I will keep this in mind for next time.

Vegard