Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Compare with working tree
Compare with working tree [message #1216644] Thu, 28 November 2013 15:19 Go to next message
ms ms is currently offline ms ms
Messages: 4
Registered: November 2013
Junior Member
Eclipse Juno, EGit Version 2.2.0.201212191850-r

I'm looking for the easiest way to compare my working tree

a) against the index (output similar to `git diff`) and
b) an arbitrary commit in the History View (output similar to e.g. `git diff HEAD~2`).

For b) the user manual mentions an option "Compare with working tree", but I can't find it..?

Thanks.
Re: Compare with working tree [message #1216663 is a reply to message #1216644] Thu, 28 November 2013 15:26 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 588
Registered: July 2009
Senior Member
You should update to a newer version (latest release is 3.1.0, 3.2.0 will be released before x-mas)

The latest (developer build 3.2.0) version provides
Compare with > HEAD
Compare with > Index
Compare with > Git Index with HEAD (only enabled if some changes are staged)
Compare with > Previous Version
Compare with > Branch, Tag or Reference
Compare with > Commit

If you want to compare 2 arbitrary versions open the history view select 2 commits and click "Compare with each other"
Re: Compare with working tree [message #1216701 is a reply to message #1216663] Thu, 28 November 2013 15:43 Go to previous messageGo to next message
ms ms is currently offline ms ms
Messages: 4
Registered: November 2013
Junior Member
You should update to a newer version (latest release is 3.1.0, 3.2.0 will be released before x-mas)

Ah, I forgot to add http://download.eclipse.org/egit/updates to the list of software sources.

The latest (developer build 3.2.0) version provides
...

So, not possible right now (using version 3.1.0)?

Thanks for your help!
Re: Compare with working tree [message #1216702 is a reply to message #1216701] Thu, 28 November 2013 15:44 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 588
Registered: July 2009
Senior Member
no, all these options should also be available in 3.1, I am just to lazy to check,
AFAIR we changed the order of menu entries but all should be available in 3.1
Re: Compare with working tree [message #1216738 is a reply to message #1216702] Thu, 28 November 2013 16:01 Go to previous messageGo to next message
ms ms is currently offline ms ms
Messages: 4
Registered: November 2013
Junior Member
OK, found it: it's not in the Team menu nor in a Git view but a separate entry in the context menu of the Package Explorer.

Thanks.
Re: Compare with working tree [message #1218316 is a reply to message #1216738] Fri, 29 November 2013 08:03 Go to previous message
Matthias Sohn is currently offline Matthias Sohn
Messages: 588
Registered: July 2009
Senior Member
yes, it was always there, the top level menu entry is provided by platform or team framework and we added
the additional entries for git based actions
Previous Topic:JGit/Android: prevent NetworkOnMainThreadException during commit
Next Topic:Set "core.excludesfile" outside, where does it appear in Egit?
Goto Forum:
  


Current Time: Sat Oct 25 05:55:36 GMT 2014

Powered by FUDForum. Page generated in 0.04982 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software