10

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 adding whatever's new to the remote, to my local. There are no branches.

When I use the command, 

git diff --color master..origin/master

I get good results, showing what changed.... what I have added to the local repo is marked with a - sign, and is shown in red; while what is on the remote is shown in green with + signs.

Is there a way to show only what is new on the remote and not on the local? That is, show me any new files on the remote and show me any new or modified lines in files on the remote (show me all the green +'s)

thanks.

wilx
  • 17,697
  • 6
  • 59
  • 114
Darby
  • 769
  • 1
  • 8
  • 26
  • is it as simple as: `git diff --color master..origin/master | grep +` – Gaurav Agarwal Feb 03 '13 at 07:19
  • Thanks for answering. This does not work if there are +'s in the text of some files that are tracked. Any other way? P.S. I'm new to git and to terminal. :-) – Darby Feb 03 '13 at 07:25
  • that returned nothing... – Darby Feb 03 '13 at 07:33
  • Hey I figured out a way to help. I had a few large files I knew I didn't want to see the diff of. I created a .gitattributes file in my project directory and added 2 lines: *.xml -diff and *.txt -diff. For me, this greatly reduced what I was having to page through to see differences. Thanks. – Darby Feb 03 '13 at 07:39
  • `git diff master..origin/master | grep ^+` I think this is what Carl mentioned. – Gaurav Agarwal Feb 03 '13 at 07:40
  • Yes, the ^+ didn't return anything. I don't know why. However, the combination of removing xml and txt files from diff in .gitattributes AND using | grep + as you suggested works great. Thanks! :-) Why do you think ^+ didn't work for me? – Darby Feb 03 '13 at 07:44
  • Also how do I mark an accepted answer? I don't see a checkmark. I guess that's because the answers were put in as comments instead of answers. ? (This is my first post.) – Darby Feb 03 '13 at 07:51
  • @Darby you can post an answer below, and select your own answer as the selected one. – VonC Feb 03 '13 at 09:15

3 Answers3

12

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.

Danny Roberts
  • 3,442
  • 23
  • 28
  • 3
    Right: three dots for `git diff`, vs. two dots for `git log`! http://stackoverflow.com/a/14426939/6309 and http://stackoverflow.com/a/7256391/6309 – VonC Jul 12 '13 at 15:12
1

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
Etienne Laurin
  • 6,731
  • 2
  • 27
  • 31
1

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
nert
  • 942
  • 6
  • 17