Recommended
Recommended
More Related Content
Viewers also liked
Viewers also liked (16)
Similar to Git Advanced
Similar to Git Advanced (20)
Recently uploaded
Recently uploaded (20)
Git Advanced
- 1. Neruti Technology Sdn Bhd www.neruti.com Cheng Ping Onn Founder & CTO Git Advanced – Guest Lecture TAR University College
- 2. Git Advanced Content •Company Intro •Dif •Merge •Reset •Rebase •Stash •Governance
- 3. Company Background Machine Learning Big Data Insight + = Maybank Fintech IBM Global Entrepreneur CIP Catalyst Recipient
- 5. Autonomous Driving Source: Tesla Model S
- 6. From AutoPilot to AutoLand Source: Technology Helps Pilots Land in Fog, Wall Street Journal.
- 10. Clone
- 11. Tracking Branch
- 12. $ git diff
- 13. dif •Deviation of content •Similar to UNIX dif •Traverse tree
- 14. dif
- 15. diff diagram
- 16. dif demo •Working file - Commit •Working file - Index •Index - Repo •Commit - Commit
- 17. Symmetrical dif $ git diff master..dev $ git log master..dev
- 18. Limiting dif Demo $ git diff –-stat master~5 master $ git diff --stat master~5 master directory //list diff on a directory $ git diff -S"target" master~5
- 19. $ git merge
- 20. Merge •Unify two/more branches •Dirty working directory/index stop merges. •Context sensitive – current branch is target branch
- 21. Merge demo •Without conflict •With conflict •Resolve conflicts •View dif on conflicts
- 23. Fast Forward Merge •Single merge base
- 24. Recursive Merge •Join two branches at a time
- 25. Criss Cross Recursive Merge •Infinite recursive merge
- 26. Octopus Merge • No conflicts • Dangerous • git branch1 branch2..branchN
- 28. Symmetrical Merge • Associative • 1+2 = 2+1 = 3
- 30. Altering Commits •Fixed problem before become legacy •Decompose large commits •Combine commits •Re-order commits
- 31. Published History •Do not alter published history
- 33. Best Practices of Commit •Meaningful message •No identical messages •No altering of published histories Bad Commit Messages
- 34. $ git reset
- 35. Reset •Recover known state •HEAD, index and working directory •Can be destructive
- 36. Reset Types HEAD Index Working Directory reset --soft Yes No No reset --mixed Yes Yes No reset --hard Yes Yes Yes
- 37. Reset demo $ git reset –-soft $ git reset –-mixed $ git reset --hard
- 39. Cherry-pick demo $ git checkout master $ git cherry-pick dev~2
- 40. reset vs. checkout •reset: recover current branch HEAD state •checkout: branch/file
- 41. Checkout File demo $ git checkout –- path/filename $ git checkout branch –- path/filename
- 42. Amend demo $ git commit --amend
- 43. $ git rebase
- 44. Rebase •Important and Useful •Alter sequence of commits •Don't rebase public history
- 45. Rebase - after $ git checkout dev $ git rebase master or $ git rebase master dev
- 46. Rebase - demo
- 47. Rebase -i •Interactive manipulate commits •Squash commits together •Developers must-have tool
- 48. Rebase - interactive $ git rebase -i master~3
- 49. Rebase vs Merge
- 50. $ git stash
- 51. Stash •Capture work in progress •Temporary store •index & working directory state. •Interrupted work flow •Can't push to remote
- 52. Stash Demo
- 53. Git in Team
- 54. Leadership Models 1)Benevolent Dictator for Life (BDFL) (Ubuntu, Linux) 2)Consensus-driven, leader- approved (Drupal) 3)Technical Review Board (Apache)
- 55. Access Model – One-Way
- 56. Access Model - Dispersed
- 57. Access Model - Collocate
- 58. Access Models - All
- 59. www.neruti.com @neruti Cheng Ping Onn ping@neruti.com Slides: facebook.com/pocheng