On Tue, Jan 4, 2011 at 5:20 PM, Curtis Olson wrote:
> That's probably not a bad tip, but I'm in a situation now where I have
> local mods that "git diff" does not report and I'm not sure how to deal with
> that. How can I find the differences between my local repository and the
> master ... especially those changes that I haven't committed or pushed yet?
>
> Thanks,
>
> Curt.
>
>
>
Curt,
Try "git diff master origin/master"
or something along those lines.
Note that it's also possible to "lose" your diff within your own local
repository, due to the index. I think that "git diff" shows the difference
between your source tree and the index, and "git diff --cached" either shows
the difference between your index and your (local) repository (or maybe your
source tree and your local repository, can't remember OTOH).
So, try "git diff --cached" to see if the changes are lost in your index
("git status" is also good for that), and then "git diff master
origin/master" to see if they are changes between your repository and the
remote one ("git log" and "gitk" should also make local/remote commit
differences clear).
Note: I'm also a git newbie, take all this with a massive pinch of salt!
Cheers - Dave
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
