Question

Is it possible to configure git to squash merges, but not squash changes from pulls? If it’s possible, how would I configure git this way?

I configured git via git config branch.<name>.mergeoptions --squash

While that works for squashing the commits from merged branches, it also tries to squash incoming changes when doing a pull.

Answer 1

In your ~/.gitconfig or .git/config per project basis.

...
[alias]
    ms = merge --squash

Edit: Overriding built-in commands are not possible, as per the git-config manpage. Updated answer to suggest having a separate command for just this.

Command aliases for the git(1) command wrapper – e.g. after defining
“alias.last = cat-file commit HEAD”, the invocation “git last” is
equivalent to “git cat-file commit HEAD”. To avoid confusion and
troubles with script usage, aliases that hide existing git commands
are ignored. Arguments are split by spaces, the usual shell quoting
and escaping is supported. quote pair and a backslash can be used to
quote them.