That was it! Sometime in the past I must have added "rebase = preserve" to my global .gitconfig.
Thank you, Philip! -- C++ tries to guard against Murphy, not Machiavelli. — Damian Conway ----- Original Message ----- From: git-users@googlegroups.com To:<git-users@googlegroups.com>, "Brendan Leber" <bren...@brendanleber.com> Cc: Sent:Thu, 19 Dec 2019 19:18:31 +0000 Subject:Re: [git-users] Help with warning about using "--preserve-merges" `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 git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/1cd6508986ee35fe56f42f8bb816e78fe2e271f8%40webmail.brendanleber.com.
