Elijah Newren via GitGitGadget wrote:
From: Elijah Newren <redacted>
There are both merge and rebase branches in the logic, and previously
both had to handle fast-forwarding. Merge handled that implicitly
(because git merge handles it directly), while in rebase it was
explicit. Given that the --ff-only flag is meant to override any
--rebase or --no-rebase, make the code reflect that by handling
--ff-only before the merge-vs-rebase logic.
No functional changes, just making it easier to verify that the codeflow
matches our precedence rules.
But it does have a functional changes. Now you are calling run_merge()
without update_submodules().
--
Felipe Contreras