• Share
  • Email
  • Embed
  • Like
  • Save
  • Private Content
Git and Eclipse - Eclipse DemoCamp Walldorf - 2010-06-22
 

Git and Eclipse - Eclipse DemoCamp Walldorf - 2010-06-22

on

  • 2,451 views

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

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

Statistics

Views

Total Views
2,451
Views on SlideShare
2,451
Embed Views
0

Actions

Likes
2
Downloads
35
Comments
0

0 Embeds 0

No embeds

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

    Git and Eclipse - Eclipse DemoCamp Walldorf - 2010-06-22 Git and Eclipse - Eclipse DemoCamp Walldorf - 2010-06-22 Presentation Transcript

    •  Gitand Eclipse
      http://eclipse.org/egit
      +
      =
      Matthias Sohn (SAP)
      matthias.sohn@sap.com
    • 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
    • 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
    • 4
      Git vs. CVS/SVN
      • Distributed
      • Eachuserhas full history
      • Ability to work off-line
      • Fast
      • Rebasepatcheseasily
      • Forks happen, deal withit
      • Powerful mergingallowstouse lots of branches
      • Centralized
      • --
      • --
      • Slow
      • Patches gostale
      • Forksarepainful
      • Mergingispainful
      Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn
    • 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
    • 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
    • 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/
      Understanding and Using Git at Eclipse | © 2010 by C. Aniszczyk, S. Pearce, R. Rosenberg and M. Sohn
    • 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 *
      • synchronizeview *
      10