On Tue, Nov 24, 2020 at 9:45 PM Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > On Tue, Nov 24, 2020 at 8:14 PM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > Before making this the default we need a solution *right now* that is > a sane default. This mail was sent by mistake. I was going to say: We need a warning like: The pull was not fast-forward, please either merge or rebase. When the default (pull.ff=only) is set. It is the current status that is more urgent to fix. -- Felipe Contreras
