git diff origin/master -- test.file It will show you a diff of a file between the master branch of remote origin and your local branch. I use it way more than

git diff origin/master -- test.file It will show you a diff of a file between the master branch of remote origin and your local branch. I use it way more than I can think of.