From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Date: Thu, 21 Jul 2022 16:26:20 GMT
Subject: Re: On-branch topic description support?
Message-ID: <20220721162620.f5ffcedkbvvdhhu7@meerkat.local>
In-Reply-To: <220721.86mtd2tqct.gmgdl@evledraar.gmail.com>

On Thu, Jul 21, 2022 at 04:53:18PM +0200, Ævar Arnfjörð Bjarmason wrote:
> I tried now with "git rebase --rebase-merges -i", and it supports it
> properly, i.e. I could re-arrange it so that it's:
> 
>               A---C---B---M topic
>              / \         /
>         X---Y   ---------
>              \
>               master

This is clever, but it has a hard restriction that nothing happens to A:

- you can't move it so it's B---A---C---M
- you can't squash A+B

Unless all the tools are taught to properly modify the merge commit.

Or am I not reading this right?

-K