Re: Show skipped commit message after rebase conflict?

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 25, 2025, 14:40 UTC
Message-ID: <xmqq5xfg5o5j.fsf@gitster.g>
In-Reply-To: <CAAVFnN=q5nCD3K1jppVcq7qB9P5WX0M070jqR_rey2hzBt0ERA@mail.gmail.com>

Cameron Steffen <cam.steffen94@gmail.com> writes:

Show 6 quoted lines

> There is already a message that prints in the case where a commit is
> automatically skipped if the changes are already applied.
>
>> warning: skipped previously applied commit <hash>
>
> Potentially we could use the very same message.

Yes, that sounds like going in the right direction.

But only if we can positively tell the reason why there is no change relative to the parent commit _is_ because the commit we are currently picking has already been applied, that is.

I am not sure how you determine that, especially after giving control back the end user upon conflict.

Thanks.