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

From: Sergey Organov <sorganov@gmail.com>
Date: Apr 12, 2018, 11:30 UTC
Message-ID: <877epczmof.fsf@javad.com>
In-Reply-To: <349021284f5b3b9c57a49f88221cef1eb4643020.1523362469.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.