Article mentions wanting to disable fast-forward merges. This should do it (in newer versions of git):

$ git config --global --add merge.ff false