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

RE: [PATCH 5/9] pull: ensure --rebase overrides ability to ff

flat view

From: Felipe Contreras <hidden>
Date: 2021-07-17 18:25:31

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

Now that the handling of fast-forward-only in combination with rebases
has been moved before the merge-vs-rebase logic, we have an unnecessary
special fast-forward case left within the rebase logic.  Actually, more
than unnecessary, it's actually a violation of the rules.  As per
https://lore.kernel.org/git/xmqqwnpqot4m.fsf@gitster.g/ (local), --rebase is
supposed to override all ff flags other than an explicit --ff-only.
Ensure that it does so by removing the fast-forward special case that
exists within the rebase logic.
What Junio said in one mail are not the rules.

This goes against what is described 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