Slides for my workshop "A practical 30 minutes introduction to Git VCS" held at Infrabel & HR-Rail

1. * without warranty* without warranty
a 30 MIN* workshop
to Git VCS
a 30 MIN* workshop
to Git VCS

2. Hi !
I am Olivier Garcia
○ software architect at Infrabel
○ co-founder of catchy.io
○ proud owner of lol.cat & swag.gg domains

3. See the complete version
with animated GIFs at
http://linux-nerd.com
See the complete version
with animated GIFs at
http://linux-nerd.com

4. VCS
○ RCS (Revision Control System) et diff : 1982
○ SCCS (Source Code Control System) : 1986-89
○ CVS (Concurrent Versions System) : 1990
○ SVN (Apache Subversion) : 2000

5. Git
○ Created by Linus Torvalds in ‘05, replacing Bitkeeper
○ Meant to deal with patch acceptation workflow
○ May ‘13, 36% use Git as main VCS (src: Eclipse Foundation)
○ ‘15 Github have 9M users

6. Git
○ Created by Linus Torvalds in ‘05, replacing Bitkeeper
○ Meant to deal with patch acceptation workflow
○ May ‘13, 36% use Git as main VCS (src: Eclipse Foundation)
○ ‘15 Github have 9M users
All guys in animated
GIFs(are/were) Githubers

7. Workshop, part 1 !
git init
git add
git status
git commit
git log

8. Fun fact about Linus Torvald

9. Linus addressing NVidia

10. Linus addressing a co-worker
Mauro, SHUT THE FUCK UP!
...
How long have you been a maintainer?
And you *still* haven't learnt the first rule of kernel
maintenance?
…
Fix your approach to kernel programming.

11. … addressing another one
There aren't enough swear-words in
the English language, so now I'll have
to call you perkeleen vittupää* just
to express my disgust and
frustration with this crap.
* Seems to translate roughly to sonofabitch

12. Workshop, part 2 !
git config
git clone
git branch
git tag
git checkout
git push

13. Coffee time

14. Workshop, part 3 !
git add -p
git checkout -p
git checkout -
git reset HEAD~3
git clean

15. Everything in one place
No need of an internet connection to
compare with trunk master
Git has efficient storage
○ delta
○ compression

16. Git can be big (e.g. Facebook’s)

17. Merge & Rebase
Both are meant to take the changes
from one branch into another.

18. The situation

19. Merge

20. Rebase

21. Workshop, part 4 !
git merge
git rebase

22. Collaboration
○ Feature workflow
Master + Feature branches + Pull requests
○ Gitflow workflow
Master + Develop + Release + Feature branches
○ Forking workflow
Several repositories + PR between repos

23. Collaboration
○ Feature workflow
Master + Feature branches + Pull requests
○ Gitflow workflow
Master + Develop + Release + Feature branches
○ Forking workflow
Several repositories + PR between repos

24. Support for our team !
Olivier Garcia
Patrick Allaert
Yannick Vanhaeren

25. FINISHED !
Any questions?
You can find me at:
@0livier (with a zero not a o)
olivier@lol.cat

26. CREDITS
Special thanks to all the people who made and
released these awesome resources:
○ Rebase / Merge images from Atlassian
○ Various GIF from gif.lol.cat
○ Presentation template by SlidesCarnival
○ Unsplash images