Option doesn't work with git < 2
Merge branch 'master' of github.com:xrobin/dotfiles

Conflicts:
	base/gitconfig.symlink