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
See my answer in this similar question:
How to preview git-pull without doing fetch?
this goes to the ~/.gitconfig file:
~/.gitconfig
[alias] diffpull=!git fetch && git diff HEAD..@{u}