Matthias Baumgarten wrote:
> On 7/21/21 3:42 AM, Elijah Newren via GitGitGadget wrote:
> > 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.
>
> Great. That now will work as I would expect it to.
Yes, but what about the current users that have setup pull.ff=only
already?
They are already relying on existing behavior.
What do you think users currently expect this to do?
[pull]
ff = only
rebase = true
git pull --no-rebase
--
Felipe Contreras
