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