Re: [PATCH v6 00/11] Introduce git-history(1) command for easy history editing

From: Elijah Newren <newren@gmail.com>
Date: Nov 20, 2025, 20:40 UTC
Message-ID: <CABPp-BG+2+vanKAS-cwAD2XZxwx=PPcu5OG58ys+8O7rfZEhug@mail.gmail.com>
In-Reply-To: <xmqqbjkw78jj.fsf@gitster.g>

On Thu, Nov 20, 2025 at 12:28 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 16 quoted lines

>
> Elijah Newren <newren@gmail.com> writes:
>
> >> This patch series is a starting point for such a command. I've
> >> significantly slimmed it down from the first couple revisions now
> >> following the discussions at the Contributor's Summit yesterday. This
> >> was my intent anyway, as I already mentioned on the last iteration.
> >
> > Sorry for taking so long to review the series now that it's based on
> > replay.  Thanks for working on this!
>
> With your comments and Phillip's, it seems that we are very close to
> a good stopping point.  Let me mark the topic as expecting a
> hopefully small and final reroll before getting ready for 'next'.
>
> Thanks, all.

I'm a little unsure if it'll be small or just one reroll. Some of the changes for patches 5 & 9 might be big (but straightforward), there's also a couple design related questions (single branch, HEAD-centric) that might bring up bigger usability issues to address (if a commit being edited is part of multiple branches, do we just rewrite all of them by default, or error out unless the user specifies how they want it handled)?, and a potential gotcha on patch 11 (how can you preserve the index and working tree if the user edits the patch while splitting a commit?) that may require rethinking or restricting that feature.