Set merge.ff option to false and change the git m alias