On Mon, Nov 23, 2020 at 5:22 PM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > On Mon, Nov 23, 2020 at 3:46 PM Felipe Contreras > <felipe.contreras@xxxxxxxxx> wrote: > > > > This patch leaves everything in place to enable this new mode, but it > > only gets enabled if the user specifically configures it; > > > > pull.rebase = ff-only. > > Why not use the existing pull.ff=only option instead of adding a new one? Because that option is only for the merge. I'd have no objection in refactoring this option so it's used for both, but this breaks existing behavior. A user that has "pull.ff=only", and does a "git pull --rebase" might expect it to work. My main interest is what happens when the user has not configured anything, which I defined with a "push.mode=default", any option (e.g. --rebase/--merge) would override that default. -- Felipe Contreras
