Git

Transcript

2. Git is free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency What is Git? 2
3. Outline • History • Design • Operations • Branch • Demo 3
4. History • Linus Torvalds dislike of centralized SCM systems • In 2002, switch to BitKeeper (not free software) • In 2005, stop supporting the Linux development community • A new source code control system called git 4
5. Design Goals • Fast • Simple Design • Support non-linear development • Fully distributed • Efficient handling of large projects (Linux kernel 3.6 15.9 SLOC (Million) 5
6. Snapshot, not Differences Difference Snapshot 6
7. Nearly Every Operation is Local 7
8. File Status 8
9. Branch • Real world workflow 1. Do work on a web site. 2. Create a branch for a new story you’re working on. 3. Do some work in that branch. 9
10. Branch • Real world workflow 1. Do work on a web site. 2. Create a branch for a new story you’re working on. 3. Do some work in that branch. 10
11. Branch • Real world workflow 1. Do work on a web site. 2. Create a branch for a new story you’re working on. 3. Do some work in that branch. 11
12. Branch 4. There is an issue with the web site, and you need to fix it immediately 12
13. Branch 5. Finish! merge hotfix into master 13
14. Branch 5. Delete hotfix branch 6. Switch back to your original story and continue working 14
15. Branch 7. Merge iss53 into master 15
16. Demo • Client: • Remote: Github 16
17. Robot Development initial commit merge add-walk add walk rename walk to run add-walk master origin (remote) push to github 17 merge hot-fix fix typo hot-fix
18. References • Pro Git - http://git-scm.com/book • 寫給⼤大家的Git教學 - http:// www.slideshare.net/littlebtc/git-5528339 • Linux Kernel - http://en.wikipedia.org/wiki/ Linux_kernel 18