From: Patrick Steinhardt <ps@pks.im>
Date: Thu, 01 Oct 2026 13:22:02 GMT
Subject: Re: git-rebase-walk
Message-ID: <ar5eereSq91xldo-@pks.im>
In-Reply-To: <ar5KL4_IKXYbx3Sb@debian>

Hi,

On Thu, Oct 01, 2026 at 01:58:42PM +0200, Alejandro Colomar wrote:
> Hi!
> 
> I use this little command to apply iterative rebases, which are easier
> to handle when there are large conflicts.  Are you interested in it?
> 
> 	$ cat $(which git-rebase-walk)
> 	#!/bin/bash
> 
> 	set -Eeufo pipefail;
> 
> 	git merge-base HEAD "$1" \
> 	| xargs -I{} git log --oneline {}.."$1" \
> 	| cut -f1 -d' ' \
> 	| tac \
> 	| while read -r c; do
> 		git rebase "$c";
> 	done;
> 
> The source code is trivial, so I guess I don't need to explain much.
> It behaves quite nicely, IME.
> 
> You may of course want to adapt it a little bit for merging in git(1).
> I could help improve it a little bit.

this reminds me a bit of git-imerge [1]. What this tool does is to
basically perform a merge between two branches incrementally using a
matrix. The tool tries to address exactly your use case, which is to
"present the user with one pairwise conflict at a time for resolution".

Maybe that tool is interesting to you. But it's certainly fallen a bit
out of date, as it hasn't received any updates for more than 6 years by
now. Chances are it stll works alright though.

Thanks!

Patrick

[1]: https://github.com/mhagger/git-imerge