Re: git-rebase-walk

From: Nico Williams <nico@cryptonector.com>
Date: Oct 3, 2026, 19:37 UTC
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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.