no autosetuprebase
Merge branch 'master' of github.com:expez/dotfiles