Cheltenham Geeks - git talk/interactive session
- 1. git commit -m “Cheltenham Geeks” Introduction to version control using git
- 3. Getting started • git --version • git --help • git <command> --help
- 4. Configuration • git config --global user.name "bob" • git config --global user.email bob@bob.com • git config --global core.editor vi • git config --global color.ui true
- 5. Staging Repository Stage Working Copy add / rmcommit checkout
- 6. After first commit on branch Initial commit Branch commit master branch
- 7. After commit on master Initial commit master branch
- 8. What is HEAD in git? Initial commit master branch HEAD After "git checkout master"
- 9. What is HEAD in git? Initial commit master branch HEADAfter "git checkout branch"
- 10. After merge from branch Initial commit master branch
- 11. After deleting branch Initial commit master
- 12. Fast forward merges Initial commit Branch commit master branch Branch commit
- 13. Fast forward merges Initial commit Branch commit master branch Branch commit
- 14. Rebase vs Merge Initial commit master branch
- 15. Rebase Initial commit master branch patch re-applied
- 17. Branching in centralised version control systems • This is an example from my current work project (using TFS) • release • release 0.1.0.0 • branch • asteroid • sputnik • meteor • cosmicdebris • main • Making and maintaining branches is expensive so they are created and setup and never changed
- 18. Branching in git • Branching is fast • Switching between branches is fast • Branches can be thrown away easily • Different workflows are possible • Create, work on, merge, delete many branches in a single day
- 19. DistributedVersion Control Source: Eric Sink’sVersion Control by Example
- 20. Distributed version control • Integration manager workflow Source: Pro Git (Scott Charon)
- 21. Distributed version control • Dictator and lieutenant workflow Source: Pro Git (Scott Charon)
- 22. Other topics • Git hooks • Stashing • Patches
- 23. Further reading • Version Control By Example (Eric Sink) • http://www.ericsink.com/vcbe/html/ index.html • Pro Git (Scott Chacon) • http://git-scm.com/book