Presentation from Eclipse DemoCamp 2010 in Walldorf, Germany - "Git and Eclipse"

1. Gitand Eclipse http://eclipse.org/egit + = Matthias Sohn (SAP) matthias.sohn@sap.com

2. Git at Eclipse Git is a Distributed Version Control System EGit is an Eclipse Team provider for Git http://www.eclipse.org/egit/ JGit is a lightweight Java library implementing Git http://www.eclipse.org/jgit/ The goal is to build an Eclipse community around Git. EGit is still beta and we want to establish a feedback loop to improve the tooling. Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

3. Gerrit Code Review Gerrit is a Code Review system based on JGit http://code.google.com/p/gerrit/ Also serves as a central git server adding access control and workflow Used by Android, JGit/Egit, … Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

5. Eachuserhas full history

6. Ability to work off-line

7. Fast

8. Rebasepatcheseasily

9. Forks happen, deal withit

10. Powerful mergingallowstouse lots of branches

11. Centralized

12. --

13. --

14. Slow

15. Patches gostale

16. Forksarepainful

17. MergingispainfulUnderstanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

18. History JGit/EGit 2005 LinusTorvalds starts Git 2006 Shawn Pearce starts JGit 2009 Eclipse decides on GitJGit/EGit move to eclipse.org SAP joins 3/2010 Released 0.7 (first release at Eclipse) Diff/Merge Algorithms, Automatic IP Logs 6/2010 Released 0.8 (Helios) Usability Improvements, Git Repositories View, Tagging 9/2010 Planned 0.9 (Helios SR1) Merge, Synchronize View, .gitignore, Stashing, Staging Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

19. Git at Eclipse EGit/JGit developed at http://egit.eclipse.org http://git.eclipse.org/ hosts live Eclipse Git repos Virgo, Mylyn Review, ScalaModules, SWTBot … http://dev.eclipse.org/git/index.html git mirrors for CVS Read-only copies kept up-to-date Can clone with git:// or http:// Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

20. No Free Lunch -- DEMO The best way to learn Git is to use Git Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

21. Conclusion DVCS like Git are powerful Git supports convenient branching and merging Git is very fast and scales well Gerrit enables a nice code review workflow Git is the future SCM of Eclipse Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

22. Resources Ask questions on the EGit forum or egit-dev/jgit-dev lists http://git-scm.com/documentation is your friend If you want comedy, watch Linus' talk at Google http://www.youtube.com/watch?v=4XpnKHJAok8 Read the Pro Git book - http://progit.org/book/ Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn

24. git add

25. git status

26. git commit

27. git diff

28. git fetch

29. git log

30. git merge *

31. git rebase

32. git remote

33. git pull

34. git push

35. git stash *

36. git branch

37. git tag

38. git checkout

39. git config

40. git format-patch

41. git mv / git rm

42. git reset

43. .gitignore *

44. synchronizeview *10