From: Nico Williams <nico@cryptonector.com>
Date: Sat, 03 Oct 2026 19:37:08 GMT
Subject: Re: git-rebase-walk
Message-ID: <asFZZGzXgGtQ4A6X@ubby>
In-Reply-To: <ar9ZRrVyr1-Fk2LZ@debian>

On Fri, Oct 02, 2026 at 09:19:56AM +0200, Alejandro Colomar wrote:
> For a git-rebase(1) option, I guess it would have to be named something
> like --first-conflict.  --first conflict because it doesn't really
> rebase on the target commit, but rather on the first commit of that
> branch which causes conflict.

I really like this.  Or `git rebase --onto-first-conflict`.

Nico
--