pull --rebase instead of fetch --all + rebase
Merge branch 'master' of ssh://github.com/sjn/dotfiles