I have a local repo and a remote repo on github. For business reasons, they aren\'t in sync. I\'ve done a lot of work on the local that I\'m keeping, and now I\'m manually add
You can diff with the common ancestor:
git diff `git merge-base master origin/master` origin/master
Or with your previous fetch:
git diff origin/master@{1} origin/master