Loading…

Flash Player 9 (or above) is needed to view presentations.
We have detected that you do not have it on your computer. To install it, go here.

Like this presentation? Why not share!

Like this? Share it with your network

Share

Getting To Know Git

on

  • 1,892 views

Git is known as 'the fast version control system' and has gained much popularity in the last couple years for good reason. Grails itself has moved to Git and is now hosted on github - ...

Git is known as 'the fast version control system' and has gained much popularity in the last couple years for good reason. Grails itself has moved to Git and is now hosted on github - http://github.com/grails.

In this session at SpringOne2gx we spent time getting to know some of the basics of Git and exploring successful tools and workflows. We will also learn how we can utilize git and git-svn to work with grails.

Statistics

Views

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

Actions

Likes
3
Downloads
33
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

Getting To Know Git Presentation Transcript

  • 1. Getting to know Git Colin Harrington – Object Partners
  • 2. SpringOne 2GX 2010. All rights reserved. Do not distribute without permission. whoami Colin Harrington Senior Consultant @ColinHarrington [email_address] [email_address]
  • 3. What is Git? Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Every Git clone is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server. Branching and merging are fast and easy to do. – http://git-scm.com/ SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 4. Why Git? SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 5. Why Git? http://github.com/grails/ SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 6. Git != SVN SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 7. Centralized VCS SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 8. Decentralized / Distributed VCS SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 9. Git – SVN Crash Course http://git-scm.com/course/svn.html SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 10. Mind << git basics start brand new repository: git init clone an existing repository: git clone <git-url> SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 11. Demo
  • 12. Mind << git basics git init git add . git commit SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 13. Mind << git fundamentals ` SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 14. Mind << git fundamentals SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 15. Mind << git fundamentals SHA hashes Authorship preservation Tree Structure! SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 16. Mind << git fundamentals http://book.git-scm.com/1_the_git_object_model.html SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 17. Porcelain vs Plumbing SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 18.
    • init
    • log
    • rebase
    • merge
    • commit
    • add
    • checkout
    • revert
    • pack
    • pull
    • push
    • status
    • bisect
    • clone
    • diff
    • grep
    • tag
    • branch
    Porcelain vs Plumbing SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 19. Mind << branch git branch git branch -a git checkout -b <branchName> git checkout <existingBranchName> SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 20. Mind << merge git merge <branch> git merge <branch> --no-commit SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 21. Mind << clone git clone <url> Similar to svn checkout Clones the entire repository! Adds a remote SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 22. Mind << remotes git branch -r git branch --track <branch> <remote-branch> git branch -r -d <remote-branch> SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 23. Mind << working with remotes Index Local Repository Remote Repository Push Pull Files on drive SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 24. Demo
  • 25. Mind << git-svn clone an entire SVN repository! git svn clone -s <url> git svn clone -s -r 1234 <url> … without -s, etc. SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 26. Mind << git-svn git svn rebase -> rebases the current branch on the remote-tracked svn branch (trunk or branches) git svn fetch -> fetches changes from svn Checkout a remote branch Keep the original branches clean!! Stash, rebase, dcommit, and do it again! SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 27. Give Back to Grails http://grails.org/contribute http://grails.org/Creating+Patches+From+Git http://grails.org/GitHub+Forking+and+Pull+Requests http://jira.codehaus.org/browse/GRAILS
  • 28. Demo
  • 29. Resources http://www.sourcemage.org/Git_Guide http://git.or.cz/course/svn.html http://www.youtube.com/watch?v=4XpnKHJAok8 http://www.kernel.org/pub/software/scm/git/docs/user-manual.html http://www.kernel.org/pub/software/scm/git/docs/everyday.html http://book.git-scm.com/ http://whygitisbetterthanx.com/ http://cheat.errtheblog.com/s/git http://progit.org/book/ http://refcardz.dzone.com/refcardz/getting-started-git http://bit.ly/avGDTz … many more valuable resources out there! SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.
  • 30. Q&A
  • 31. Thank you!
  • 32. Credits
    • Git logo :: by azizash :: http://azizash.deviantart.com/art/GIT-Logo-95183398
    • Grails logo :: http://grails.org/Brand
    • Perl logo :: Criado por O'Reilly :: http://commons.wikimedia.org/wiki/File:Perl.jpg
    • VLC logo :: illustration (and iteration) by Richard C. G. Øiestad. GNU GPL by Video LAN
    • Rails logo :: KSEltar :: http://commons.wikimedia.org/wiki/File:Ruby_on_Rails_logo.svg
    • jQuery logo :: http://commons.wikimedia.org/wiki/File:Logo_jquery_215x53.gif
    • Linux logo :: gg3po (kde-look.org source) :: http://commons.wikimedia.org/wiki/File:NewTux.svg
    • Eclipse logo :: http://www.eclipse.org/artwork/
    • Android logo :: Google and Android's developpers :: http://commons.wikimedia.org/wiki/File:Android_robot.svg
    SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.