Version Control With Git

My talk for UCSY IT Camp 2014 - Version Control with Git

Transcript

1. Version Control System with Git Zwenexsys
2. Zwenexsys About me
3. Zwenexsys Programmer at Zwenexsys http://zwenex.com
4. Zwenexsys What is VCS ? • Version control or Source Control • Used in word processing, wiki system, software development
5. Zwenexsys Why VCS ? • To share your codes or resources with others • To keep track of history • Easy to rollback
6. Zwenexsys Why VCS ?
7. Zwenexsys Why VCS ?
8. Zwenexsys What is • Open source distributed VCS • Initially designed and developed by Linus Torvalds • Very popular
9. Zwenexsys Installation • Download from http://git-scm.com/ downloads • GUI Programs http://git-scm.com/ downloads/guis
10. Zwenexsys Installation Windows http://help.github.com/win-set-up-git Mac http://help.github.com/mac-set-up-git Linux http://help.github.com/linux-set-up-git
11. Zwenexsys Installation
12. Zwenexsys Configuration In your terminal / command prompt git config --global user.name "Your Name" git config --global user.email "your@email.com"
13. Zwenexsys Let’s start using it
14. Zwenexsys Initialization • Go to your project folder • Check if it’s correct folder • Run git init
15. Zwenexsys Adding files git add . git commit -m “initial commit”
16. Zwenexsys Steps Staging Area Dirty git add .
17. Zwenexsys Steps Staging Area Dirty Clean git add . git commit -m “my commi
18. Zwenexsys Steps Staging Area Dirty Clean Make changes git add . git commit -m “my commi
19. Zwenexsys Tracking History git log
20. Zwenexsys Current Status git status
21. Zwenexsys See the difference git diff
22. Zwenexsys Share with others • Push the local repo to remote repo • Git Hosting • BitBucket ( www.bitbucket.org ) • GitHub ( www.github.com )
23. Zwenexsys Share with others • Create a repo at the hosting • Add the address to the local repo git remote add origin <remote url>
24. Zwenexsys Share with others • Another user can “clone” it. git clone <remote url>
25. Zwenexsys Share with others • Push it ! git push origin master • Pull it! git pull origin master
26. Zwenexsys Share with others User A git add . git commit -m “bug fix #1”
27. Zwenexsys Share with others User A git add . git commit -m “bug fix #1” Remote Repo git push
28. Zwenexsys Share with others User A git add . git commit -m “bug fix #1” Remote Repo git push User B git pull
29. Zwenexsys Share with others User A git add . git commit -m “bug fix #1” Remote Repo git push User B git pull git add . git commit -m “bug fix #2”
30. Zwenexsys Share with others User A git add . git commit -m “bug fix #1” Remote Repo git push User B git pull git add . git commit -m “bug fix #2” git push
31. Zwenexsys Share with others User A git add . git commit -m “bug fix #1” Remote Repo git push User B git pull git add . git commit -m “bug fix #2” git push git pull
32. Zwenexsys Try it online • http://try.github.io • http://pcottle.github.io/learnGitBranching • https://www.codeschool.com/courses/git-real
33. Zwenexsys Q & A
34. Zwenexsys Thank you & have fun!