Using git

A quick run through of the capabilities and how to use git. Written with an ops perspective, but presented to developers.

Transcript

1. Phil Fenstermacher pcfens@wm.edu
2. <ME> *nix Engineering Swem Automation
7. <ME> *nix Engineering Swem Automation </ME>
8. WHAT IS GIT? Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
9. WHAT IS GIT? Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
10. WHAT IS GIT? Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
13. WHAT IS GIT? Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
14. WHY GIT? Fast Versatile Widely Used
15. WHAT GIT ISN'T Drop in replacement for any other SCM Server for sharing code
16. GETTING GIT http://git-scm.com or Most package managers (apt, yum, brew, etc.)
17. GETTING STARTED $ c d p r o j e c t s / m y _ d i r e c t o r y $ g i t i n i t I n i t i a l i z e d e m p t y G i t r e p o s i t o r y i n / h o m e / p h i l / p r o j e c t s / m y _ d i r e c t o r y / . g i t $ c d p r o j e c t s $ g i t c l o n e h t t p : / / g i t h u b . c o m / p c f e n s / g i t - d e m o . g i t C l o n i n g i n t o ' g i t - d e m o ' . . . r e m o t e : C o u n t i n g o b j e c t s : 3 , d o n e . r e m o t e : C o m p r e s s i n g o b j e c t s : 1 0 0 % ( 2 / 2 ) , d o n e . r e m o t e : T o t a l 3 ( d e l t a 0 ) , r e u s e d 0 ( d e l t a 0 ) R e c e i v i n g o b j e c t s : 1 0 0 % ( 3 / 3 ) , d o n e . $ c d g i t - d e m o /
18. Files you see and edit
19. Changes ready to be committed
20. Permanent change history
24. MAKE CHANGES Add or remove something from index.html # M o v e c h a n g e s i n t o s t a g i n g $ g i t a d d i n d e x . h t m l # C o m m i t t h e c h a n g e s $ g i t c o m m i t - m " M a d e a l o c a l c h a n g e "
25. BENEFITS OF GIT Lots of copies Working Directory is the Repository Commit Staging Integrity Checking Lightweight Branching
26. BRANCHING Easy to switch between Feature/topic branches Merge branches into each other Disposable Public or Private
27. DEMO Branching Maintaining Local Customizations
28. BENEFITS OF GIT Lots of copies Working Directory is the Repository Commit Staging Integrity Checking Lightweight Branching Widely Used Hooks into CI Systems Deploy Directly from SCM
29. ADDITIONAL RESOURCES http://try.github.com http://git-scm.com/book http://whygitisbetterthanx.com https://illustrated-git.readthedocs.org