From: Patrick Steinhardt <ps@pks.im>
Date: Wed, 03 Sep 2025 12:19:54 GMT
Subject: Re: [PATCH RFC v2 09/16] builtin/history: implement "reorder" subcommand
Message-ID: <aLgyai6muTkG21FM@pks.im>
In-Reply-To: <CALnO6CB=ZPO33gz0qyCGrC6E2_b2S1kGZkLd-q_CS37gupvPXA@mail.gmail.com>

On Tue, Aug 26, 2025 at 09:03:18AM -0400, D. Ben Knoble wrote:
> On Sun, Aug 24, 2025 at 1:43 PM Patrick Steinhardt <ps@pks.im> wrote:
> > diff --git a/Documentation/git-history.adoc b/Documentation/git-history.adoc
> > index db5b292994..b36cd925dd 100644
> > --- a/Documentation/git-history.adoc
> > +++ b/Documentation/git-history.adoc
> > @@ -39,12 +40,18 @@ rewrite history in different ways:
> >  `drop <commit>`::
> >         Drop a commit from the history and reapply all children of that
> >         commit on top of the commit's parent. The commit that is to be
> > -       dropped must be reachable from the current `HEAD` commit.
> > +       dropped must be reachable from the currently checked-out commit.
> >  +
> >  Dropping the root commit converts the child of that commit into the new
> >  root commit. It is invalid to drop a root commit that does not have any
> >  child commits, as that would lead to an empty branch.
> 
> Fixup in the wrong commit, maybe?

Indeed, fixed now.

Patrick