Subject: Re: [PATCH v6 14/15] rebase -i: introduce --rebase-merges=[no-]rebase-cousins

From: Sergey Organov <[email-masked]>
Date: Thu, 12 Apr 2018 14:30:56 +0300

Johannes Schindelin <[email-masked]> writes:

[...]

> ++
> +By default, or when `no-rebase-cousins` was specified, commits which do not
> +have `<upstream>` as direct ancestor will keep their original branch point.

<upstream>

sans quotes, <...> are used without them throughout the manual page.

> +If the `rebase-cousins` mode is turned on, such commits are rebased onto
> +`<upstream>` (or `<onto>`, if specified).

<upstream> (or <newbase>, if --onto is specified).

sans quotes, and there is no <onto> defined.

-- Sergey