EGit and JGit are Eclipse projects that provide integration of the Git version control system into Eclipse. EGit is a team provider that allows using Git repositories in Eclipse projects. JGit is a lightweight Java library for Git that is used by EGit and other projects like Gerrit. The presentation discusses the history and new features of EGit and JGit since version 0.8, including improvements to code review and integration with Gerrit. It demonstrates that EGit 1.0 is now ready for mainstream use.

1. EGit and Friends Ready for Prime Time ?http://eclipse.org/egithttp://code.google.com/p/gerritStefan Lay (SAP)stefan.lay@sap.comTwitter: @stefanlay+=Matthias Sohn (SAP)matthias.sohn@sap.comTwitter: @masohn

2. Die HauptdarstellerGitisteinverteiltesVersionierungssystemEGitisteinEclipse Team Provider fürGithttp://www.eclipse.org/egit/JGitisteineleichtgewichtigeJava-BibliothekfürGithttp://www.eclipse.org/jgit/Gerritistein Code-Review-System, basierend auf JGit http://code.google.com/p/gerrit/EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

3. Geschichte von Git, JGit und EGitEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

4. Neue Features in EGit - seit HeliosRelease 0.9 Merge

5. Synchronize View

6. Git configuration

7. IgnoreEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

8. Neue Features in EGit - seit HeliosRelease 0.9 Merge

9. Synchronize View

10. Git configuration

11. IgnoreRelease 0.10 Pull

12. Rebase

13. Cherry-Pick

14. Merge tool

15. HTTP authentication

16. Histogram diffEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

17. Neue Features in EGit - seit HeliosRelease 0.9 Merge

18. Synchronize View

19. Git configuration

20. IgnoreRelease 0.11 Fetch from Gerrit

21. Push to / Fetch from Upstream

22. Tree Compare

23. Mylyn IntegrationRelease 0.10 Pull

24. Rebase

25. Cherry-Pick

26. Merge tool

27. HTTP authentication

28. Histogram diffEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

29. Neue Features in EGit - seit HeliosRelease 0.9 Merge

30. Synchronize View

31. Git configuration

32. IgnoreRelease 0.11 Fetch from Gerrit

33. Push to / Fetch from Upstream

34. Tree Compare

35. Mylyn IntegrationRelease 0.12 Gerrit configuration

36. Git repo config in preferences

37. Gerrit Mylyn connectorRelease 0.10 Pull

38. Rebase

39. Cherry-Pick

40. Merge tool

41. HTTP authentication

42. Histogram diffEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

43. Neue Features in EGit 1.0Release 1.0 Commit Search and Commit Viewer

44. Gerrit Review Summary Notes

45. Staging View

46. Blame

47. GitHub Mylyn connectorEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

48. Statistik seit Helios (0.8…1.0)Committer (Contributor) EGit: 15 (47)

49. JGit: 9 (32)Changes EGit: 1143 commits

50. JGit: 960 commitsFixed Bugs EGit: 534

51. JGit: 114 EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

52. Gerritgitgitgitgit- verify proposed changes- continuous integration builds- clone repository - fetch / push changesDeveloper PCDeveloper PCHudsongitgitEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

53. DEMOEGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

54. Git at EclipseEGit/JGit developed at http://egit.eclipse.orghttp://git.eclipse.org/hosts live Eclipse Git reposVirgo, Mylyn Review, ScalaModules, SWTBot …http://dev.eclipse.org/git/index.html git mirrors for CVSRead-only copies kept up-to-dateCan clone with git:// or http://EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

55. git-addgit-format-patchgit-shortloggit-relinkgit-rev-parsegit-amgit-gcgit-showgit-remotegit-show-branchgit-archivegit-grepgit-stashgit-repackgit-verify-taggit-bisectgit-initgit-statusgit-replacegit-whatchangedgit-branchgit-loggit-submodulegit-annotategit-bundlegit-merge* git-taggit-blamegit-checkoutgit-mvgit-configgit-cherry.gitignoregit-cherry-pickgit-notesgit-fast-exportgit-count-objectsgit daemongit-cleangit-pullgit-fast-importgit-difftoolHTTP supportgit-clonegit-pushgit-filter-branchgit-fsckMylynintegrationgit-commitgit-rebasegit-mergetoolgit-get-tar-commit-idStaging Viewgit-describegit-resetgit-pack-refsgit-help* Synchronize Viewgit-diffgit-revertgit-prunegit-merge-treeHistory Viewgit-fetchgit-rmgit-refloggit-rerereRepositories ViewFeatures EGit 1.0* planned for next release, supported, partial, missing, irrelevant for EGit

56. Gerrit Code ReviewGerrit developed at http://code.google.com/p/gerrithttps://review.source.android.com/Gerrit for Android projects (also Gerrit)EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG

57. Git ResourcesAsk questions on the EGit forum or egit-dev/jgit-dev listshttp://git-scm.com/documentation is your friendIf you want comedy, watch Linus' talk at Googlehttp://www.youtube.com/watch?v=4XpnKHJAok8Read the Pro Git book - http://progit.org/book/EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG