Re: Show skipped commit message after rebase conflict?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> 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 thought we merely would need to see that there are no staged changes
to be committed, and there is a currently-picking commit that will now
be skipped? I don't need to know whether the commit was already
applied. I just want to know that the commit in the rebase plan is not
being committed.

On Fri, Jul 25, 2025 at 9:40 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> Cameron Steffen <cam.steffen94@xxxxxxxxx> writes:
>
> > 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.





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux