Thread (44 messages) 44 messages, 3 authors, 2021-07-22

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

flat view

From: Felipe Contreras <hidden>
Date: 2021-07-17 18:05:01

Elijah Newren via GitGitGadget wrote:
From: Elijah Newren <redacted>

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help