remove auto rebase when pulling
Merge branch 'master' of github.com:peutipoix/dotfiles