Set default merge options to --no-ff.
Merge branch 'master' of github.com:tomaszwojcik/dotfiles