From: Junio C Hamano Date: Wed, 17 Jun 2026 12:19:29 GMT Subject: Re: [PATCH] rebase: mention --abort alongside --continue Message-ID: In-Reply-To: Phillip Wood 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 ;-)