This document summarizes recent updates to the Eclipse EGit and JGit projects. It describes new features added in versions 3.2 through 3.5, including improved interactive rebasing, stash support, push wizards, and team/repository menus. It also outlines planned work for 3.6 such as new ignore functionality and submodule improvements. Finally, it discusses potential integration of logical model and merge support for EMF models using the EMF Compare project.

1. News from EGit
Matthias Sohn (SAP)
Mikaël Barbero (Obeo)
EclipseCon Europe 2014

2. JGit / EGit 3.2
Dec 2013
JGit EGit
git describe
rebase.autostash
interactive rebase
push branch wizard
push tag wizard
improved blame
interactive rebase

3. jgit describe
$ jgit checkout v3.5.1.201410131835-r
$ jgit describe
v3.5.1.201410131835-r
$ jgit checkout master
$ jgit describe
v3.5.1.201410131835-r-17-g5c85d5d
nearest tag no of
commits
since tag
commit-id

4. [rebase]
autostash = true
Rebase with dirty working tree:
● stash
● rebase
● stash pop (may conflict)

5. Push branch / push tag wizards

6. Improved blame

7. JGit / EGit 3.3
Feb 2014
JGit EGit
symlinks on Java 7
support Apache HttpClient
basic symlink support
squash commits in history

8. Symlinks on Java 7
$ cd b
$ ln -s ../a a
$ ls –l
-rw-r--r-- B.txt
lrwxr-xr-x a -> ../a

9. Squash commits in history view

10. JGit / EGit 3.4
June 2014 (Luna)
JGit EGit
new layout of commit
graph
kerberos authentication
archive command
multi cherry-pick & revert
edit / reword commit in
history
init in non-empty
directory
warn on checkout if
launch is running

11. New layout of commit graph
JGit
gitk

12. ArchiveCommand:
Creating source archives

13. Multi cherry-pick / revert
Modify history

14. Warn on checkout if launch is running

15. JGit / EGit 3.5
Sept 2014
JGit EGit
.netrc
rebase --preserve-merges
cherry-pick --no-commit
improved interactive rebase
new stash menu
stash viewer
improved push wizards
team menu on working set
repo menu on resource
new logo

16. Improved
interactive rebase

17. Stash support

18. Improved push wizards

19. Team menu on working set

20. Repository menu on resource

21. in progress for 3.6
JGit EGit
new ignore implementation
improved submodule
support
git attributes
merge driver (text, binary)
model merge
symlink support
Oomph setup of dev
workspace

22. Working with Models in EGit

23. What if EGit…
prevents you from committing non compiling code?
Version 1
Version 2

24. What if EGit…
prevents you from committing non compiling code?
Version 1
Version 2

25. What if EGit…
could detect semantic conflicts?
C1
C2
C3
C4
C5
C3
C4

26. What if EGit…
understood the files it is working with?
(cc by-sa) Massimo Barbieri

27. Eclipse Team
Eclipse Team
EGit Subversive Eclipse CVS

28. Eclipse Team Logical Model Support
Eclipse Team
EGit
Logical model
ext. point
Logical model
merger ext. point

29. Eclipse Team Logical Model Support
Eclipse Team
EGit
Logical model
ext. point
Logical model
merger ext. point
?

30. Eclipse Team Logical Model Support
Eclipse Team
EGit
Logical model
ext. point
Logical model
merger ext. point
Provider
(EMF Compare)

31. Eclipse Team Logical Model Support
Eclipse Team
EGit
Logical model
ext. point
Logical model
merger ext. point
Provider
(EMF Compare)

32. Eclipse Team Logical Model Support
Eclipse Team
EGit
Logical model
ext. point
Logical model
merger ext. point
Provider
(EMF Compare)

33. Logical Model Compare & Merge
Support for EMF Models with EMF Compare

34. Logical Model Compare & Merge
Support for EMF Models with EMF Compare

35. Working with Models in EGit
Demos
https://www.eclipse.org/emf/compare/
http://download.eclipse.org/modeling/
emf/compare/updates/egit-logical/nightly/

36. Questions ??