On Sat, May 6, 2023 at 10:20 AM Thomas Guyot <tguyot@xxxxxxxxx> wrote: > You shouldn't change the user's config - you can instead use > command-line switches with git-pull to force the desired behavior. In > this case (which is also the default if there is no pull.rebase config) > it will merge with the remote (and that merge will be a fast-forward if > you have no added commits). Actually no: it won't merge the current branch with the remote, it will merge the remote with the current branch, which is not the same. This is one of the many reasons many git veterans recommend most users to simply avoid doing `git pull` [1]: it very rarely does what you want. [1] https://felipec.wordpress.com/2021/07/13/why-is-git-pull-broken/ -- Felipe Contreras
