Use '--no-ff' flag only when 'git merge' is executed from the shell.
git pull: use --ff (default)
git merge: use --no-ff (by zsh function)