git: diff between file in local repo and origin

Question

I want to find the differences between a file I have in my local repo vs what is in the origin master.

I know that there is git diff, howev

Answer 1

Full answer to the original question that was talking about a possible different path on local and remote is below

1. git fetch origin
2. git diff master -- [local-path] origin/master -- [remote-path]

Assuming the local path is docs/file1.txt and remote path is docs2/file1.txt, use git diff master -- docs/file1.txt origin/master -- docs2/file1.txt

This is adapted from GitHub help page here and Code-Apprentice answer above