SlideShare ist ein Scribd-Unternehmen logo
1 von 79
Git



2Value, Haarlem, 14-12-2010
woensdag 15 december 2010
Git
                    Not subversion, CVS, Perforce and whatever more




2Value, Haarlem, 14-12-2010
woensdag 15 december 2010
Stefan wie?




woensdag 15 december 2010
Stefan wie?

                  • Freelancer: Ingewikkeld




woensdag 15 december 2010
Stefan wie?

                  • Freelancer: Ingewikkeld
                  • Symfony Community Manager



woensdag 15 december 2010
Stefan wie?

                  • Freelancer: Ingewikkeld
                  • Symfony Community Manager
                  • PHPBenelux crew


woensdag 15 december 2010
Versiebeheer




woensdag 15 december 2010
Versiebeheer

                  • Wie werkt(e) er met versiebeheer?




woensdag 15 december 2010
Versiebeheer

                  • Wie werkt(e) er met versiebeheer?
                  • Wie werkt(e) er met CVS?



woensdag 15 december 2010
Versiebeheer

                  • Wie werkt(e) er met versiebeheer?
                  • Wie werkt(e) er met CVS?
                  • Wie werkt(e) er met Subversion?


woensdag 15 december 2010
Versiebeheer

                  • Wie werkt(e) er met versiebeheer?
                  • Wie werkt(e) er met CVS?
                  • Wie werkt(e) er met Subversion?
                  • Wie met iets anders? en wat?

woensdag 15 december 2010
Subversion




woensdag 15 december 2010
Subversion

                        • 1 centrale repository




woensdag 15 december 2010
Subversion

                        • 1 centrale repository
                        • ieder een eigen checkout



woensdag 15 december 2010
Subversion

                        • 1 centrale repository
                        • ieder een eigen checkout
                        • commit = delen met iedereen


woensdag 15 december 2010
Subversion

                        • 1 centrale repository
                        • ieder een eigen checkout
                        • commit = delen met iedereen
                        • altijd verbinding met repo-server

woensdag 15 december 2010
Subversion
                                  Server
                                  Repository




               Checkout     Checkout     Checkout   Checkout




woensdag 15 december 2010
Git




woensdag 15 december 2010
Git

                  • Distributed Version Control System




woensdag 15 december 2010
Git

                  • Distributed Version Control System
                  • Ieder een eigen repository



woensdag 15 december 2010
Git

                  • Distributed Version Control System
                  • Ieder een eigen repository
                  • Committen op je eigen repository


woensdag 15 december 2010
Git

                  • Distributed Version Control System
                  • Ieder een eigen repository
                  • Committen op je eigen repository
                  • Delen: Pushen of pullen

woensdag 15 december 2010
Git

                     repository    repository      repository



               Checkout           Checkout       Checkout


               Checkout           Checkout       Checkout
                     repository     repository     repository




woensdag 15 december 2010
Git

                     repository    repository      repository



               Checkout           Checkout       Checkout


               Checkout           Checkout       Checkout
                     repository     repository     repository




woensdag 15 december 2010
Git

                     repository    repository      repository



               Checkout           Checkout       Checkout


               Checkout           Checkout       Checkout
                     repository     repository     repository




woensdag 15 december 2010
git init



woensdag 15 december 2010
git add



woensdag 15 december 2010
git commit



woensdag 15 december 2010
git checkout -- <file>



woensdag 15 december 2010
git reset HEAD <file>



woensdag 15 december 2010
git status



woensdag 15 december 2010
woensdag 15 december 2010
Code delen




woensdag 15 december 2010
Code delen

                  • Lokaal committen




woensdag 15 december 2010
Code delen

                  • Lokaal committen
                  • Git clone



woensdag 15 december 2010
Code delen

                  • Lokaal committen
                  • Git clone
                  • Zip, deel


woensdag 15 december 2010
Code delen

                  • Lokaal committen
                  • Git clone
                  • Zip, deel
                   • niet praktisch

woensdag 15 december 2010
git remote



woensdag 15 december 2010
git pull



woensdag 15 december 2010
git fetch



woensdag 15 december 2010
git push



woensdag 15 december 2010
Github



woensdag 15 december 2010
woensdag 15 december 2010
Branchen




woensdag 15 december 2010
Branchen

                  • Subversion




woensdag 15 december 2010
Branchen

                  • Subversion
                   • branch op de server



woensdag 15 december 2010
Branchen

                  • Subversion
                   • branch op de server
                   • branching is duur


woensdag 15 december 2010
Branchen




woensdag 15 december 2010
Branchen

                  • Git




woensdag 15 december 2010
Branchen

                  • Git
                   • heel goedkoop



woensdag 15 december 2010
Branchen

                  • Git
                   • heel goedkoop
                   • 1 commando, lokale branch


woensdag 15 december 2010
Branchen

                  • Git
                   • heel goedkoop
                   • 1 commando, lokale branch
                   • switchen heel makkelijk

woensdag 15 december 2010
woensdag 15 december 2010
Tagging




woensdag 15 december 2010
Tagging

                  • Subversion




woensdag 15 december 2010
Tagging

                  • Subversion
                   • Op server



woensdag 15 december 2010
Tagging

                  • Subversion
                   • Op server
                   • Committen naar tag kan


woensdag 15 december 2010
Tagging




woensdag 15 december 2010
Tagging

                  • Git




woensdag 15 december 2010
Tagging

                  • Git
                   • lightweight



woensdag 15 december 2010
Tagging

                  • Git
                   • lightweight
                   • annotated


woensdag 15 december 2010
Tagging

                  • Git
                   • lightweight
                   • annotated
                     • lijkt het meest op Subversion

woensdag 15 december 2010
Annotated


                  • git tag -a tagnaam -m bladiebla



woensdag 15 december 2010
Lightweight


                  • git tag tagnaam



woensdag 15 december 2010
Submodules



woensdag 15 december 2010
Submodules




woensdag 15 december 2010
Submodules

                  • Subversion




woensdag 15 december 2010
Submodules

                  • Subversion
                   • svn propedit svn:externals



woensdag 15 december 2010
Submodules

                  • Subversion
                   • svn propedit svn:externals
                  • Git


woensdag 15 december 2010
Submodules

                  • Subversion
                   • svn propedit svn:externals
                  • Git
                   • git submodule add <repo> <reponaam>

woensdag 15 december 2010
git submodule update



woensdag 15 december 2010
git submodule init



woensdag 15 december 2010
Tips & Tricks




woensdag 15 december 2010
Tips & Tricks

                  • git stash




woensdag 15 december 2010
Tips & Tricks

                  • git stash
                  • git blame



woensdag 15 december 2010
Tips & Tricks

                  • git stash
                  • git blame
                  • git-svn


woensdag 15 december 2010
Oefening



woensdag 15 december 2010
woensdag 15 december 2010
• http://www.leftontheweb.com/
                  • https://github.com/skoop


woensdag 15 december 2010

Weitere ähnliche Inhalte

Andere mochten auch

Universal Analytics ir Enhanced Ecommerce
Universal Analytics ir Enhanced EcommerceUniversal Analytics ir Enhanced Ecommerce
Universal Analytics ir Enhanced EcommerceVladas Sapranavicius
 
2016 - Рік англійської мови в Україні
2016 - Рік англійської мови в Україні2016 - Рік англійської мови в Україні
2016 - Рік англійської мови в УкраїніРОМЦ БКР
 
Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016
Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016
Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016Vladas Sapranavicius
 
tax.utah.gov forms current tc tc-110f
tax.utah.gov forms current tc  tc-110ftax.utah.gov forms current tc  tc-110f
tax.utah.gov forms current tc tc-110ftaxman taxman
 
Webinaras apie el. komercijos platformos parengimą darbui
Webinaras apie el. komercijos platformos parengimą darbuiWebinaras apie el. komercijos platformos parengimą darbui
Webinaras apie el. komercijos platformos parengimą darbuiVladas Sapranavicius
 
Aug 3-2012 - Teamlead - О мероприятии
Aug 3-2012 - Teamlead - О мероприятииAug 3-2012 - Teamlead - О мероприятии
Aug 3-2012 - Teamlead - О мероприятииTeamlead
 
Teamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в Agile
Teamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в AgileTeamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в Agile
Teamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в AgileTeamlead
 
Distintos tipos de calzado deportivo
Distintos tipos de calzado deportivoDistintos tipos de calzado deportivo
Distintos tipos de calzado deportivochristiangilvega
 
Ольга Кобилянська "Земля"
Ольга Кобилянська "Земля"Ольга Кобилянська "Земля"
Ольга Кобилянська "Земля"OksanaTroshuna
 
Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“
Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“
Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“Vladas Sapranavicius
 
Crecimiento y desarrollo en menor de 1 año 2016
Crecimiento y desarrollo en menor de 1 año 2016Crecimiento y desarrollo en menor de 1 año 2016
Crecimiento y desarrollo en menor de 1 año 2016MAHINOJOSA45
 
Diarrea y deshidratacion2016 resumen v2.0
Diarrea y deshidratacion2016 resumen v2.0Diarrea y deshidratacion2016 resumen v2.0
Diarrea y deshidratacion2016 resumen v2.0MAHINOJOSA45
 

Andere mochten auch (20)

Universal Analytics ir Enhanced Ecommerce
Universal Analytics ir Enhanced EcommerceUniversal Analytics ir Enhanced Ecommerce
Universal Analytics ir Enhanced Ecommerce
 
2016 - Рік англійської мови в Україні
2016 - Рік англійської мови в Україні2016 - Рік англійської мови в Україні
2016 - Рік англійської мови в Україні
 
Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016
Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016
Efektyviausias pardavimų kanalas e-komercijoje - SEO 2016
 
tax.utah.gov forms current tc tc-110f
tax.utah.gov forms current tc  tc-110ftax.utah.gov forms current tc  tc-110f
tax.utah.gov forms current tc tc-110f
 
SLiDESHARE
SLiDESHARESLiDESHARE
SLiDESHARE
 
Webinaras apie el. komercijos platformos parengimą darbui
Webinaras apie el. komercijos platformos parengimą darbuiWebinaras apie el. komercijos platformos parengimą darbui
Webinaras apie el. komercijos platformos parengimą darbui
 
Joost Negenman - NPO
Joost Negenman - NPOJoost Negenman - NPO
Joost Negenman - NPO
 
бифштексы
бифштексыбифштексы
бифштексы
 
Aug 3-2012 - Teamlead - О мероприятии
Aug 3-2012 - Teamlead - О мероприятииAug 3-2012 - Teamlead - О мероприятии
Aug 3-2012 - Teamlead - О мероприятии
 
Teamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в Agile
Teamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в AgileTeamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в Agile
Teamlead Atlassian Day 4-2013 | Agile Technologes | Визуализация в Agile
 
Distintos tipos de calzado deportivo
Distintos tipos de calzado deportivoDistintos tipos de calzado deportivo
Distintos tipos de calzado deportivo
 
Ольга Кобилянська "Земля"
Ольга Кобилянська "Земля"Ольга Кобилянська "Земля"
Ольга Кобилянська "Земля"
 
Golpeos de tenis
Golpeos de tenisGolpeos de tenis
Golpeos de tenis
 
Adenomas2012
Adenomas2012Adenomas2012
Adenomas2012
 
Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“
Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“
Rasa Urbonaitė: SEMINARAS „SEO e-komercijoje - mada ar būtinybė?“
 
Sistema locomotor ossos
Sistema locomotor   ossosSistema locomotor   ossos
Sistema locomotor ossos
 
Crecimiento y desarrollo en menor de 1 año 2016
Crecimiento y desarrollo en menor de 1 año 2016Crecimiento y desarrollo en menor de 1 año 2016
Crecimiento y desarrollo en menor de 1 año 2016
 
Diarrea y deshidratacion2016 resumen v2.0
Diarrea y deshidratacion2016 resumen v2.0Diarrea y deshidratacion2016 resumen v2.0
Diarrea y deshidratacion2016 resumen v2.0
 
Adenomas2012
Adenomas2012Adenomas2012
Adenomas2012
 
RESISTENCIA GENERAL II
RESISTENCIA GENERAL IIRESISTENCIA GENERAL II
RESISTENCIA GENERAL II
 

Mehr von Stefan Koopmanschap

Git for Subversion Users (ZendCon 2011)
Git for Subversion Users (ZendCon 2011)Git for Subversion Users (ZendCon 2011)
Git for Subversion Users (ZendCon 2011)Stefan Koopmanschap
 
Open Up (International PHP Conference Spring Edition 2011)
Open Up (International PHP Conference Spring Edition 2011)Open Up (International PHP Conference Spring Edition 2011)
Open Up (International PHP Conference Spring Edition 2011)Stefan Koopmanschap
 
Would you like docs with that? - Zend Webinar
Would you like docs with that? - Zend WebinarWould you like docs with that? - Zend Webinar
Would you like docs with that? - Zend WebinarStefan Koopmanschap
 
Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)Stefan Koopmanschap
 
Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)Stefan Koopmanschap
 
Integrating symfony and Zend Framework (IPC 2010)
Integrating symfony and Zend Framework (IPC 2010)Integrating symfony and Zend Framework (IPC 2010)
Integrating symfony and Zend Framework (IPC 2010)Stefan Koopmanschap
 
Would you like docs with that? (Pfcongres 2010)
Would you like docs with that? (Pfcongres 2010)Would you like docs with that? (Pfcongres 2010)
Would you like docs with that? (Pfcongres 2010)Stefan Koopmanschap
 
The Symfony Community - How to (get) help
The Symfony Community - How to (get) helpThe Symfony Community - How to (get) help
The Symfony Community - How to (get) helpStefan Koopmanschap
 
Integrating symfony and Zend Framework (PHPBarcelona 2009)
Integrating symfony and Zend Framework (PHPBarcelona 2009)Integrating symfony and Zend Framework (PHPBarcelona 2009)
Integrating symfony and Zend Framework (PHPBarcelona 2009)Stefan Koopmanschap
 
Integrating symfony and Zend Framework (PHPNW09)
Integrating symfony and Zend Framework (PHPNW09)Integrating symfony and Zend Framework (PHPNW09)
Integrating symfony and Zend Framework (PHPNW09)Stefan Koopmanschap
 
Integrating symfony and Zend Framework
Integrating symfony and Zend FrameworkIntegrating symfony and Zend Framework
Integrating symfony and Zend FrameworkStefan Koopmanschap
 
5 essential tools for the PHP Developer on Windows
5 essential tools for the PHP Developer on Windows5 essential tools for the PHP Developer on Windows
5 essential tools for the PHP Developer on WindowsStefan Koopmanschap
 
The Power Of Refactoring (php|tek 09)
The Power Of Refactoring (php|tek 09)The Power Of Refactoring (php|tek 09)
The Power Of Refactoring (php|tek 09)Stefan Koopmanschap
 
Myphp-busters: symfony framework (php|tek 09)
Myphp-busters: symfony framework (php|tek 09)Myphp-busters: symfony framework (php|tek 09)
Myphp-busters: symfony framework (php|tek 09)Stefan Koopmanschap
 
The Power Of Refactoring (PHPCon Italia)
The Power Of Refactoring (PHPCon Italia)The Power Of Refactoring (PHPCon Italia)
The Power Of Refactoring (PHPCon Italia)Stefan Koopmanschap
 
Myphp-busters: symfony framework (PHPCon.it)
Myphp-busters: symfony framework (PHPCon.it)Myphp-busters: symfony framework (PHPCon.it)
Myphp-busters: symfony framework (PHPCon.it)Stefan Koopmanschap
 
The Power Of Refactoring (4developers Krakow)
The Power Of Refactoring (4developers Krakow)The Power Of Refactoring (4developers Krakow)
The Power Of Refactoring (4developers Krakow)Stefan Koopmanschap
 

Mehr von Stefan Koopmanschap (20)

A Practical Look At Symfony2
A Practical Look At Symfony2A Practical Look At Symfony2
A Practical Look At Symfony2
 
Git for Subversion Users (ZendCon 2011)
Git for Subversion Users (ZendCon 2011)Git for Subversion Users (ZendCon 2011)
Git for Subversion Users (ZendCon 2011)
 
Conference Speaking 101
Conference Speaking 101Conference Speaking 101
Conference Speaking 101
 
Open Up (International PHP Conference Spring Edition 2011)
Open Up (International PHP Conference Spring Edition 2011)Open Up (International PHP Conference Spring Edition 2011)
Open Up (International PHP Conference Spring Edition 2011)
 
Would you like docs with that? - Zend Webinar
Would you like docs with that? - Zend WebinarWould you like docs with that? - Zend Webinar
Would you like docs with that? - Zend Webinar
 
Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)
 
Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)Would you like docs with that? (IPC 2010)
Would you like docs with that? (IPC 2010)
 
Integrating symfony and Zend Framework (IPC 2010)
Integrating symfony and Zend Framework (IPC 2010)Integrating symfony and Zend Framework (IPC 2010)
Integrating symfony and Zend Framework (IPC 2010)
 
Would you like docs with that? (Pfcongres 2010)
Would you like docs with that? (Pfcongres 2010)Would you like docs with that? (Pfcongres 2010)
Would you like docs with that? (Pfcongres 2010)
 
The Symfony Community - How to (get) help
The Symfony Community - How to (get) helpThe Symfony Community - How to (get) help
The Symfony Community - How to (get) help
 
Integrating symfony and Zend Framework (PHPBarcelona 2009)
Integrating symfony and Zend Framework (PHPBarcelona 2009)Integrating symfony and Zend Framework (PHPBarcelona 2009)
Integrating symfony and Zend Framework (PHPBarcelona 2009)
 
Integrating symfony and Zend Framework (PHPNW09)
Integrating symfony and Zend Framework (PHPNW09)Integrating symfony and Zend Framework (PHPNW09)
Integrating symfony and Zend Framework (PHPNW09)
 
Integrating symfony and Zend Framework
Integrating symfony and Zend FrameworkIntegrating symfony and Zend Framework
Integrating symfony and Zend Framework
 
Scrum (dutch)
Scrum (dutch)Scrum (dutch)
Scrum (dutch)
 
5 essential tools for the PHP Developer on Windows
5 essential tools for the PHP Developer on Windows5 essential tools for the PHP Developer on Windows
5 essential tools for the PHP Developer on Windows
 
The Power Of Refactoring (php|tek 09)
The Power Of Refactoring (php|tek 09)The Power Of Refactoring (php|tek 09)
The Power Of Refactoring (php|tek 09)
 
Myphp-busters: symfony framework (php|tek 09)
Myphp-busters: symfony framework (php|tek 09)Myphp-busters: symfony framework (php|tek 09)
Myphp-busters: symfony framework (php|tek 09)
 
The Power Of Refactoring (PHPCon Italia)
The Power Of Refactoring (PHPCon Italia)The Power Of Refactoring (PHPCon Italia)
The Power Of Refactoring (PHPCon Italia)
 
Myphp-busters: symfony framework (PHPCon.it)
Myphp-busters: symfony framework (PHPCon.it)Myphp-busters: symfony framework (PHPCon.it)
Myphp-busters: symfony framework (PHPCon.it)
 
The Power Of Refactoring (4developers Krakow)
The Power Of Refactoring (4developers Krakow)The Power Of Refactoring (4developers Krakow)
The Power Of Refactoring (4developers Krakow)
 

Git workshop (2value, 14-12-2010)