git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Cameron Steffen <cam.steffen94@gmail.com>
Cc: phillip.wood@dunelm.org.uk,  git@vger.kernel.org,
	 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	 Kristoffer Haugsbakk <code@khaugsbakk.name>
Subject: Re: Show skipped commit message after rebase conflict?
Date: Fri, 25 Jul 2025 17:04:47 -0700	[thread overview]
Message-ID: <xmqq5xff3jhc.fsf@gitster.g> (raw)
In-Reply-To: <CAAVFnN=S-bu1FNafyyH797AeBxUu+8vk5yJ5xaxCUBkBZin_6w@mail.gmail.com> (Cameron Steffen's message of "Fri, 25 Jul 2025 10:20:45 -0500")

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

>> 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.

Then your earlier idea to reuse the same message

>> warning: skipped previously applied commit <hash>
>
> Potentially we could use the very same message.

would not work, would it?

  reply	other threads:[~2025-07-26  0:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-24 14:43 Show skipped commit message after rebase conflict? Cameron Steffen
2025-07-24 22:03 ` Junio C Hamano
2025-07-25 14:02   ` Phillip Wood
2025-07-25 14:14     ` Cameron Steffen
2025-07-25 14:40       ` Junio C Hamano
2025-07-25 15:20         ` Cameron Steffen
2025-07-26  0:04           ` Junio C Hamano [this message]
2025-07-26  2:40             ` Cameron Steffen
2025-07-26  7:00           ` Johannes Sixt
2025-07-26 15:00             ` Cameron Steffen
2025-07-25 15:24     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq5xff3jhc.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=cam.steffen94@gmail.com \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).