Egit democamp-darmstadt-2011-06-21
Upcoming SlideShare
Loading in...5
×
 

Like this? Share it with your network

Share

Egit democamp-darmstadt-2011-06-21

on

  • 1,550 views

 

Statistics

Views

Total Views
1,550
Views on SlideShare
1,550
Embed Views
0

Actions

Likes
0
Downloads
8
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

Egit democamp-darmstadt-2011-06-21 Presentation Transcript

  • 1. EGit and Friends
    Ready for
    Prime Time ?
    http://eclipse.org/egit
    http://code.google.com/p/gerrit
    Stefan Lay (SAP)
    stefan.lay@sap.com
    Twitter: @stefanlay
    +
    =
    Matthias Sohn (SAP)
    matthias.sohn@sap.com
    Twitter: @masohn
  • 2. Die Hauptdarsteller
    GitisteinverteiltesVersionierungssystem
    EGitisteinEclipse Team Provider fürGit
    http://www.eclipse.org/egit/
    JGitisteineleichtgewichtigeJava-BibliothekfürGit
    http://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 EGit
    2005     LinusTorvaldsinitiiertGit
    2006     Shawn Pearce initiiert JGit
    2009    Eclipse entscheidetsichfürGit JGit/EGit ziehen um nach eclipse.org
    3/2010 JGit/EGit 0.7 (1. Release bei Eclipse)  
    - 5/2011 0.8 – 0.12
        
    3/2011 Eclipse Community Award: Most innovative new feature
    6/2011 Release 1.0 (Eclipse Indigo)
    9/2011 Release 1.1 (planned, Eclipse Indigo SR1)
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 4. Neue Features in EGit - seit Helios
    Release 0.9
    • Merge
    • 5. Synchronize View
    • 6. Git configuration
    • 7. Ignore
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 8. Neue Features in EGit - seit Helios
    Release 0.9
    • Merge
    • 9. Synchronize View
    • 10. Git configuration
    • 11. Ignore
    Release 0.10
    • Pull
    • 12. Rebase
    • 13. Cherry-Pick
    • 14. Merge tool
    • 15. HTTP authentication
    • 16. Histogram diff
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 17. Neue Features in EGit - seit Helios
    Release 0.9
    • Merge
    • 18. Synchronize View
    • 19. Git configuration
    • 20. Ignore
    Release 0.11
    • Fetch from Gerrit
    • 21. Push to / Fetch from Upstream
    • 22. Tree Compare
    • 23. Mylyn Integration
    Release 0.10
    • Pull
    • 24. Rebase
    • 25. Cherry-Pick
    • 26. Merge tool
    • 27. HTTP authentication
    • 28. Histogram diff
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 29. Neue Features in EGit - seit Helios
    Release 0.9
    • Merge
    • 30. Synchronize View
    • 31. Git configuration
    • 32. Ignore
    Release 0.11
    • Fetch from Gerrit
    • 33. Push to / Fetch from Upstream
    • 34. Tree Compare
    • 35. Mylyn Integration
    Release 0.12
    • Gerrit configuration
    • 36. Git repo config in preferences
    • 37. Gerrit Mylyn connector
    Release 0.10
    • Pull
    • 38. Rebase
    • 39. Cherry-Pick
    • 40. Merge tool
    • 41. HTTP authentication
    • 42. Histogram diff
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 43. Neue Features in EGit 1.0
    Release 1.0
    • Commit Search and Commit Viewer
    • 44. Gerrit Review Summary Notes
    • 45. Staging View
    • 46. Blame
    • 47. GitHub Mylyn connector
    EGit 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 commits
    Fixed Bugs
    • EGit: 534
    • 51. JGit: 114
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 52. Gerrit
    git
    git
    git
    git
    - verify proposed changes
    - continuous integration builds
    - clone repository
    - fetch / push changes
    Developer PC
    Developer PC
    Hudson
    git
    git
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 53. DEMO
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 54. 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://
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG
  • 55. git-add
    git-format-patch
    git-shortlog
    git-relink
    git-rev-parse
    git-am
    git-gc
    git-show
    git-remote
    git-show-branch
    git-archive
    git-grep
    git-stash
    git-repack
    git-verify-tag
    git-bisect
    git-init
    git-status
    git-replace
    git-whatchanged
    git-branch
    git-log
    git-submodule
    git-annotate
    git-bundle
    git-merge
    * git-tag
    git-blame
    git-checkout
    git-mv
    git-config
    git-cherry
    .gitignore
    git-cherry-pick
    git-notes
    git-fast-export
    git-count-objects
    git daemon
    git-clean
    git-pull
    git-fast-import
    git-difftool
    HTTP support
    git-clone
    git-push
    git-filter-branch
    git-fsck
    Mylynintegration
    git-commit
    git-rebase
    git-mergetool
    git-get-tar-commit-id
    Staging View
    git-describe
    git-reset
    git-pack-refs
    git-help
    * Synchronize View
    git-diff
    git-revert
    git-prune
    git-merge-tree
    History View
    git-fetch
    git-rm
    git-reflog
    git-rerere
    Repositories View
    Features EGit 1.0
    * planned for next release, supported, partial, missing, irrelevant for EGit
  • 56. Gerrit Code Review
    Gerrit developed at http://code.google.com/p/gerrit
    https://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 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/
    EGit 1.0 – Ready for Prime Time ?| © 2011 by Matthias Sohn, Stefan Lay, SAP AG