From: Elijah Newren Date: Tue, 25 Nov 2025 03:39:36 GMT Subject: Re: [PATCH v6 00/11] Introduce git-history(1) command for easy history editing Message-ID: In-Reply-To: On Mon, Nov 24, 2025 at 8:31 AM Phillip Wood wrote: > > On 23/11/2025 02:30, Elijah Newren wrote: > > On Fri, Nov 21, 2025 at 6:31 AM Phillip Wood wrote: > >> [...] > > The range is included in the command above: "--ancestry-path > > ^${OLD_COMMIT_ID} --branches" > > > > And because of this, we don't even really need to "find" all the > > branches as a separate step, it's just part of the same revision walk > > for rewriting commits. > > Oh, so --branches means we consider all the branches and --ancestry-path > excludes the those that are not descended from the commit we're > rewriting - nice. We'd need to be careful about modifying the commit at > the tip of a branch though as in that case we'd exclude the branch from > the set of commits with ^{OLD_COMMIT_ID} and so "git replay" would not > update that branch. Ah, indeed, that's a good callout. [...] > > My replay-edit work used a just slightly modified form of that > > function, [...] > > Interesting - I watched you're git merge talk about it recently and it > looked quite impressive. Thanks. :-)