corinthia-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Dennis E. Hamilton" <dennis.hamil...@acm.org>
Subject RE: Tricky GIT question.
Date Sat, 27 Dec 2014 23:36:06 GMT
With the current branch set to "jan" try

  git diff master -- ./foo.c

If that doesn't show the changes in the desired direction, switch to master and do

  git jan -- ./foo.c

 - Dennis

-----Original Message-----
From: jan i [mailto:jani@apache.org] 
Sent: Saturday, December 27, 2014 12:34
To: dev@corinthia.incubator.apache.org
Subject: Tricky GIT question.

Hi all.

I dont work in branch "master", but always create a local branch "jan".

Can someone help me, how to make a diff.

in branch "jan" I have modified file foo.c how can I see a diff against
master

something like

git diff -m master foo.c


of course
git diff foo.c

works but only against my last work commit in branch jan.

Thanks in advance for any help.
rgds
jan I.


Ps. How about that we in wiki, make a "helpful git commands" page ?


Mime
View raw message