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? Thanks! B -- C++ tries to guard against Murphy, not Machiavelli. — Damian Conway -- 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 git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/c44ba257664424acd9bed934d76f69143c672962%40webmail.brendanleber.com.
