Fetch + rebase instead of pull
fetch + merge --ff-only
Merge branch 'master' of https://github.com/marcuswestin/git-star