Re: [PATCH v6 1/3] rebase: add documentation and test for --no-rebase-merges

From: Sergey Organov <sorganov@gmail.com>
Date: Mar 8, 2023, 22:25 UTC
Message-ID: <878rg6zxrq.fsf@osv.gnss.ru>
In-Reply-To: <20230305050709.68736-2-alexhenrie24@gmail.com>

Alex Henrie <alexhenrie24@gmail.com> writes:

[...]

> +When rebasing merges, there are two modes: `rebase-cousins` and
> +`no-rebase-cousins`. If the mode is not specified, it defaults to
> +`no-rebase-cousins`. In `no-rebase-cousins` mode, commits which do not have
> +`<upstream>` as direct ancestor will keep their original branch point, i.e.

I realize this is in fact unchanged from the original, so is not exactly material of these series, but what is the meaning of "direct ancestor"? Is it just "parent"?

> +commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path`
> +option will keep their original ancestry by default.

Excluded when --ancestry-path is applied to what commit, exactly? To the commit being considered for rebase, or to the <upstream>, or to the 'fork_point'?

Please notice that rebase claims to operate either on <upstream>..HEAD or 'fork_point'..HEAD range, and --ancestry-path without arguments applies to the left commit of the range when used in "git log".

Looks like some clarifications are needed here, even though maybe not in these series?

Thanks, -- Sergey Organov