I’ve read through Japanese and English articles to understand the difference between git merge —ff and —no-ff, so I’ll introduce them here.

Difference Between git merge --ff and --no-ff

Japanese Articles

• 図で分かるgit-mergeの--ff, --no-ff, --squashの違い - アジャイルSEを目指すブログ

English Articles

• What is the difference between `git merge` and `git merge --no-ff`? - Stack Overflow
• A successful Git branching model » nvie.com
• OneFlow - a Git branching model and workflow | End of Line Blog

I Basically Use git merge --no-ff origin/master

I basically use git merge —no-ff origin/master.

git fetch origin master
git merge --no-ff origin/master

Setting alias nffmerge in .gitconfig

Furthermore, I’ve set an alias called nffmerge in .gitconfig, so I use git nffmerge origin/master.

~/.gitconfig

[alias]
  nffmerge = merge --no-ff

Setting Default Behavior to merge.ff false

There’s also an approach to set the default behavior of git commands to merge.ff false.

git config --global --add merge.ff false
git config --global --add pull.ff only

• gitのmerge --no-ff のススメ - Qiita

That’s all from the Gemba.