Is there a “git pull --dry-run” option in Git?

Question

Is there such a thing as git pull --dry-run to see how stuff will be merged before it messes up my working tree?

Right now I am doing:

git f         


        

Answer 1

Since pulling implies merging, I'd go with running git merge --abort if your script detects there were any conflicts and merging failed.