On 19/12/2019 18:59, Brendan Leber wrote:
> I upgraded git on my MacBook and now when I use `git pull` to update
> my local repository I get the following error:
>
> warning: git rebase --preserve-merges is deprecated. Use
> --rebase-merges instead.
>
> The problem is I'm not using `--preserve-merges` in my command. I'm
> guessing there's a setting somewhere that is causing pull to use
> preserve merges instead of rebase merges but I can't find it.
>
> Can someone point me to where I need to look so I can get rid of this
> warning?
>
>
`git config -l` will list all your config settings (which may include these)
`git config --help` will give you the man page that lists all the config
setting.
If on a suitable browser https://git-scm.com/docs/git-config, then go
through the 28 occurrences of "pull" to see which can take those
merge/rebase options,
e.g.
branch.<name>.merge
branch.<name>.mergeOptions
branch.<name>.rebase
pull.rebase
etc.
HTH
--
Philip
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/770fcb24-f5d2-62af-931c-d47ff0fc563a%40iee.email.
