Elijah Newren wrote: > On Wed, Jul 14, 2021 at 1:37 AM Son Luong Ngoc <sluongng@xxxxxxxxx> wrote: > > I am out of the loop in this thread but I have been seeing strange behaviors > > with pull.rebase=true in the 'next' branch and also in the 'master' > > branch in recent days. > > I'm not surprised it happens with recent versions, but I'd expect this > to have happened with older versions too. Is this not reproducible > with git-2.32.0 or older git versions? I already provided an accurate target [1]. > > > git version > > git version 2.32.0.432.gabb21c7263 > > > git config -l | grep pull > > pull.rebase=true > > pull.ff=false > > So, you have conflicting configuration options set. pull.ff=false > maps to --no-ff which is documented to create a merge. > pull.rebase=true maps to --rebase which says to run a rebase. > > You probably want to drop one of these. `pull.ff` will be honored by `git pull --merge`. [1] https://lore.kernel.org/git/60eeff69293fb_10e52087a@natae.notmuch/ -- Felipe Contreras
