Git and Eclipsehttp://eclipse.org/egit

Matthias Sohn (SAP)matthias.sohn@sap.com

+ =

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

Git at Eclipse

Git is a Distributed Version Control System

EGit is an Eclipse Team provider for Githttp://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

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, …  

4

Git vs. CVS/SVN Distributed

Each user has full history Ability to work off-line Fast Rebase patches easily Forks happen, deal with it Powerful merging allows

to use lots of branches

Centralized -- -- Slow Patches go stale Forks are painful Merging is painful

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

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

History JGit/EGit

2005    Linus Torvalds starts Git

2006    Shawn Pearce starts JGit

2009    Eclipse decides on Git JGit/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

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-dateCan clone with git:// or http://

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

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

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

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/

10

Features EGit 0.8

Supported

Partially supported

Not yet supported

* planned for 0.9

git init / git clone git add git status git commit git diff git fetch git log git merge * git rebase git remote

git pull git push git stash * git branch git tag git checkout git config git format-patch git mv / git rm git reset

.gitignore * synchronize

view *