Disallow merge commits

Workflow Git
1

Want to never be the guy/gal that accidentally added the merge commit? Add the following to your ~/.gitconfig:

[merge]
  ff = only
2

…and this is default if you are using thoughtbot’s dotfiles. cool.