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
I believe you can put 3 dots between the two branches in the command and then it does only whats new in the second with respect to the first, i.e.
git diff master...feature
to see what's new on feature, and
git diff feature...master
to see what's new on master. In your case feature can be origin/master
and that should work fine.
Try looking at git help rev-list
. The option you are probably looking for is --right-only
, so maybe this gets you what you want:
git diff --color --right-only master..origin/master