Git Intro Workshop - SUC (2015-10-24)

Transcript

1. Git Intro Workshop 2015-10-24 (Sat) Southern University College Huiming 
 teohuiming@gmail.com twitter.com/teohm github.com/teohm VJKUUNKFGKUCXCKNCDNGJGTG speakerdeck.com/teohm
2. Done? Install Github Desktop (Windows) Sign-up GitHub (Free Account) Step-by-Step Guide: bit.ly/github-install
3. Schedule Part 1 (10am - 12noon) • What is Version Control? • Git Basic ———— Lunch ————— Part 2 (1pm - 3pm) • Git Remote & GitHub • GitHub Free Web Hosting
4. Part 1
5. Version Control • Version Control System (VCS) — track changes to a set of contents over time so that you can go back to a specific version later. • Survey — What VCS do you use?
6. copy-paste VCS
7. .bk VCS
8. .bk VCS
9. Version Control Different ways to access history & content • Local - rcs, (your copy-paste vcs) • Centralized - cvs, subversion, … • Decentralized - bitkeeper, git, mercurial, …
10. Version Control Different ways to track change history • Linear - subversion
 
 • Directed acyclic graph (DAG) - git r1 r2 r3
11. Version Control Different ways to store content • Delta (diff)-based 
 - mercurial, 
 subversion
 • Snapshot-based 
 - git,
 (your copy-paste vcs)
12. Git Decentralized, DAG Graph History, Snapshot-Based
14. I can use Git to … • Record code changes • Go back to a previous version • Switch between multiple work • Backup to cloud • Upload to web hosting • Merge codes from team members
15. I can use Git to … • Record code changes • Go back to a previous version • Switch between multiple work • Backup to cloud • Upload to web hosting • Merge codes from team members Part 1 Part 2
16. Record changes • Setup new repository • Add new file, modify file, delete file • Commit the changes 
 git init
 git status
 git add .
 git add index.html
 git add -p
 git commit
 git commit -m 'one-line summary'
 git rm old.html

17. Prepare a commit working folder stage
 (index) commit git add git commit
18. Go back in time • Go back to a previous commit • Bring a back deleted file • Reverse a wrong commit 
 git log git log --graph --oneline git show 98ca3
 git checkout 98ca3
 git checkout 98ca3 index.html
 git revert 98ca3

19. Switch between work • Half-way working on a big feature • And boss asks you fix a urgent bug NOW! • Handle merge conflicts 
 git branch big_feature git checkout big_feature git checkout master
 git checkout -b bug_fix
 git merge bug_fix
 git merge big_feature git stash

21. Part 2
22. Git Alias • Add shortcut commands to Git e.g. 
 git status -> git st
 git commit -> git ci • Edit /Users/username/.gitconfig [alias]
 co = checkout
 ci = commit
 st = status
 br = branch
 lg = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short 

23. Backup to GitHub • Push codes to a remote Git hosting service 
 git remote add origin url git push -u origin master
24. Deploy to GitHub Pages • Deploy to GitHub free website hosting • Your personal website URL — username.github.io 
 pages.github.com
25. Next Step? • Learn by start using! • Books • Pro Git, Scott Chacon — progit.org • Pro Git 中⽂文版 — iissnan.com/progit/ • Talks • Introduction to Git with Scott Chacon of GitHub (YouTube) • More materials • git-scm.com/doc/ext
26. Feedback bit.ly/git-workshop-survey Wish to join more workshops?