On Mon, Nov 23, 2020 at 05:51:42PM -0600, Felipe Contreras wrote: > > On the other hand, it looks quite funny for that single variable > > that controls the way how pull works, whether rebase or merge is > > used, is pull.REBASE. > > Which is precisely why I wanted to rename it to pull.mode. > > In my option git pull should have three main modes: > > 1. fast-forward only > 2. merge > 3. rebase > > The fast-forward only mode can be considered a merge, or a rebase, > doesn't matter. I agree that is much nicer. I'd worry a bit though that it may be confusing to users to have this new mode option _and_ the existing pull.rebase and pull.ff options, which overlap (but not completely). It might be something we could solve with good documentation, though. -Peff
