RE: [PATCH 2/9] t7601: add tests of interactions with multiple merge heads and config

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jul 17, 2021, 18:04 UTC
Message-ID: <60f31bc6a42f8_25f2208b4@natae.notmuch>
In-Reply-To: <329802382bfa24241c2333bd38284aa77e3eb9f0.1626536508.git.gitgitgadget@gmail.com>

Elijah Newren via GitGitGadget wrote:

Show 8 quoted lines

> From: Elijah Newren <newren@gmail.com>
> 
> There were already code checking that --rebase was incompatible with
> a merge of multiple heads.  However, we were sometimes throwing warnings
> about lack of specification of rebase vs. merge when given multiple
> heads.  Since rebasing is disallowed with multiple merge heads, that
> seems like a poor warning to print; we should instead just assume
> merging is wanted.

Where is that explained in the documentation?

-- 
Felipe Contreras

$ 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.