Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org,  Harald Nordgren <haraldnordgren@gmail.com>
Subject: Re: [PATCH] rebase: mention --abort alongside --continue
Date: Wed, 17 Jun 2026 05:19:29 -0700	[thread overview]
Message-ID: <xmqqo6h9z7e6.fsf@gitster.g> (raw)
In-Reply-To: <bd7dc183-6597-4fd0-ae64-682d46480cd4@gmail.com> (Phillip Wood's message of "Wed, 17 Jun 2026 10:52:28 +0100")

Phillip Wood <phillip.wood123@gmail.com> writes:

>> It is very true that users who know what they are doing and got into
>> such conflicts are opted to go into such a situation tnat it is
>> unlikely that they would appreciate a choice to abort.
>
> That's not quite what I was trying to say which was that aborting in the 
> case of conflicts is more likely than in the case of a failed exec.

Ah, I misread the intention.  And I agree with you that "failed
test" case is very likely to lead to "further changes/amends" and
not "aborted rebase".

> So if I've understood we'd print a message explaining what's happened 
> and how to continue followed by a hint about aborting. The message would 
> depend on what problem caused the rebase to stop, but the hint would be 
> the same in each case. That sounds fine to me.

Yeah, and "failed test" would not be one of the problem that would
invite the hint to "abort".  I am OK with that, too.  FWIW, I am OK
if the "you can abort" hint cannot be configured away, either ;-)


      reply	other threads:[~2026-06-17 12:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-15 19:19 [PATCH] rebase: mention --abort alongside --continue Harald Nordgren via GitGitGadget
2026-06-16  8:36 ` Phillip Wood
2026-06-16 17:33   ` Junio C Hamano
2026-06-17  8:56     ` Harald Nordgren
2026-06-17  9:52     ` Phillip Wood
2026-06-17 12:19       ` Junio C Hamano [this message]

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=xmqqo6h9z7e6.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=haraldnordgren@gmail.com \
    --cc=phillip.wood123@gmail.com \
    /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