Is there such a thing as git pull --dry-run to see how stuff will be merged before it messes up my working tree?
git pull --dry-run
Right now I am doing:
git f
# fetch new commits from origin $ git fetch # check what are the differences and judge if safe to apply $ git diff origin/master # actually merge the fetched commits $ git pull