Re: git-rebase-walk

From: Nico Williams <nico@cryptonector.com>
Date: Oct 1, 2026, 17:40 UTC
Message-ID: <ar6a8OkGhmYVoM7E@ubby>
In-Reply-To: <ar6LUeH3AjxbiMgd@debian>

On Thu, Oct 01, 2026 at 06:50:08PM +0200, Alejandro Colomar wrote:

Show 5 quoted lines

> > Also, you need some extra handling of conflicts.
> 
> No, that's the nice part.  It works as is.  When I see a conflict, I get
> stopped at the rebase that caused the issue.  I solve that conflict, and
> then can --continue that one rebase.  Or I can --abort that one rebase.

Oh, because of `set -euo pipefail`, hah, yes.

> > https://gist.github.com/nicowilliams/ea2fa2b445c2db50d2ee6509c3526297
> 
> Hmmm, 93 LoC is certainly more interesting than the 4k+ python script.

There is that, indeed.

> I'll have a look.  I'll also attempt at writing a bisect-rebase from
> scratch myself, to compare.

I love that attitude!

> I'll certainly try your script; thanks!
> 
> Out of curiosity, did you offer this script to git(1)?

No, though I think I've mentioned it here before. I'd be happy to submit a patch, but I'd first have to get employer approval for it (which is not a problem -- it will only take time).

> If not, why not?

No real reason other than bureaucracy on my side.

> This is something that would clearly be helpful to people solving rebase
> conflicts in many projects.

I agree!

> Have a lovely night!

Cheers!

Nico