Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > On Wed, Jul 21, 2021 at 6:47 AM Felipe Contreras > <felipe.contreras@xxxxxxxxx> wrote: >> >> Users need to specify if they want to either --merge or --rebase, but >> unfortunately the former is missing. > > Ack. I think it's just historical, because long long ago it used to be > that 'git pull' always merged unless told otherwise with --rebase. The "--no-rebase" option, which is documented as a synonym for "--rebase=false", has been there, but the implementation is buggy in some corner cases, which has been worked on recently in a separate thread. I do not think it is too bad to add "--merge" as yet another synonym for "--rebase=false".
