Re: rewinding interactive rebases

From: Erik Cervin Edin <erik@cervined.in>
Date: Mar 1, 2022, 09:24 UTC
Message-ID: <CA+JQ7M-+kq1MTh+DG+HCmXkpsF5Esm_0V=4=2_DS2_ZYdjP2+g@mail.gmail.com>
In-Reply-To: <YhPiqlM81XCjNWpk@ugly>

On Tue, Mar 1, 2022 at 1:21 AM Oswald Buddenhagen <oswald.buddenhagen@gmx.de> wrote:

> did you mean to answer only privately?

No, mea culpa :(

Show 7 quoted lines

> On Mon, Feb 28, 2022 at 10:32:16PM +0100, Erik Cervin Edin wrote:
> >What's the connection to the original thread [...]?
> >
> that depends on what you want to interpret into the original thread,
> given that a bunch of use cases and solutions were mentioned. my
> solution is actually functionally identical to one of the later
> subthreads, as i found after the fact.

Sorry but it's a long thread and at least I am unsure which parts you are referring to and how your script fits into that.

> >Maybe you could explain it a bit in the context of the problem.
> >
> there really isn't much to it. the git log + git reset are the essence.
> just run it in the middle of an interactive rebase to see yourself.

Could you elaborate on the intended/usual flow here? Rebase => Get conflict => Fix conflict => run the script => ..??