Contenu connexe
Similaire à A byte of git
Similaire à A byte of git (20)
A byte of git
- 1. a byte of git
weng.wei@zalora.sg
Friday, July 5, 13
- 2. • Linus Torvalds on git
• http://www.youtube.com/watch?
v=4XpnKHJAok8
Friday, July 5, 13
- 3. • "tinker and fix things that aren't broken" -
The greatest geek who ever lived
• http://theoatmeal.com/comics/tesla
Friday, July 5, 13
- 5. Git is hard
• Different concept
• More concept
• More command
• Not Windows friendly
Friday, July 5, 13
- 6. concepts
• changesetVS revision
• distributedVS centralized
• http://hginit.com/00.html
• a Mercurial tutorial by Joel Spolsky
• Subversion Re-education
Friday, July 5, 13
- 8. git ci --amend
• Edit commit history is common
• sacred revision history in SVN
Friday, July 5, 13
- 10. Why bother?
• staging / commit / amend / push
• vs svn commit
• Better change management !!!
Friday, July 5, 13
- 12. git branch
• very cheap to create
• 16 bytes written on local disk
• git flow
Friday, July 5, 13
- 15. Problem!
• svn diff -r 354791:358048 > ../
SEAFAS-7136.diff
• Take hours
• SEAFAS-7136.diff
• 33361 lines
• Contains changes from trunk
Friday, July 5, 13
- 16. • How long does it take to upstream on
branch?
• What if you have 10 branches to do
upstream?
• What if upstream has conflicts?
Friday, July 5, 13
- 17. All SVN problems have
SVN solutions
We could do everything in SVN..
Friday, July 5, 13
- 19. git rebase
• Take seconds
• Error?
• git rebase --abort
• Or, test in a new branch
Friday, July 5, 13
- 24. Access control
• Via ssh
• Read & Write access control
• Different repos with different access
• production repo
• staging repo
Friday, July 5, 13
- 25. GUI?
• Who needs GUI?
• Mac
• SourceTree
• Win & Linux
• TortoiseGit?
Friday, July 5, 13