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
You can get the effect you want by creating a new throw-away branch from your current one and doing the git pull there. If you're unhappy with the results, the original branch is intact.
git pull