I use pull.ff only. That way I don’t get the automatic, and I find annoying merges when pulling. Instead I have to be explicit about whether I want to merge or rebase. Often during package dev it is the latter. However, an automatic rebase I would find a bit dangerous.
3 Likes