`git config --global merge.ff no` (reverted from commit 926918e845382de6dae367b1dfa7ed163612b894)