Revision history [back]

Yes, it is possible to make "ff-only" the default setting for "git pull" but not for "git merge".

You can set the default behavior for "git pull" as follows:

git config --global pull.ff only

This sets the default setting for "git pull" to perform fast-forward merges only.

To override this setting for a specific merge, you can use the "--no-ff" option with the "git merge" command:

git merge --no-ff <branch>

This will force a non-fast-forward merge even if the default setting is "ff-only".