CraftCamp for Students - Introduction to git Git is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed by Linus Torvalds for Linux kernel development in 2005, and has since become the most widely adopted version control system for software development.

1. Introduction to Git
Feedback: #craftcamps

2. Version Control
● Samenwerken op 1 project
● Teruggaan naar vorige versie
● Aanpassingen vergelijken
● Commit history

3. Centralized Version Control
ClearCase, CVS, Perforce,
Subversion...

4. Distributed Version Control
Bazaar, Git,
Mercurial...

5. ● Door Linus Torvalds in 2005
● Alternatief voor Bitkeeper
● Volledig file-based
● Huidige version: 2.4.5

7. git config --list
git config --global --list
Bekijk settings

8. git config --global user.name “Andy Van Den Heuvel”
git config --global user.email “andy.vandenheuvel@craftworkz.co”
Stel gebruikersinfo in

9. git config --global http.proxy “http://proxy.server.com:8080”
git config --global https.proxy “https://proxy.server.com:8080”
Stel proxy in

10. git config --global --unset http.proxy
git config --global --unset https.proxy
Verwijder Config

11. Ready?

12. mkdir ucll
cd ucll
git init
echo ‘puts “Hello world”’ > hello.rb
git add hello.rb
git commit -m “Initial commit”
Start git project

13. echo ‘puts “Hello Craftworkz”’ > hello.rb
git status -s
git diff
git add hello.rb
git commit -m “update greeting”
Maak aanpassingen

14. git mv hello.rb hello2.rb
git commit -m “rename file”
Bestand hernoemen

15. echo “Temporary file” > tmpfile
git status -s
echo “tmpfile” > .gitignore
git add .gitignore
git commit -m “add gitignore”
git status -s
Negeer bestanden

16. ls -al
git rm hello2.rb
git status -s
git commit -m “delete file”
Verwijder bestanden

17. git log
git log --oneline
Bekijk history

18. Github
● Best place to share code!
● 9M gebruikers
● 21M repositories
“GitHub was born into a world where there was no
existing market for paid Git hosting. We would be
creating the market. I vividly remember telling people, “I
don’t expect GitHub to succeed right away”
-- Tom Preston-Werner

19. git clone https://github.com/andyvdh/remotedemo.git
git remote -v
Clone Repository

20. git fetch origin
git merge origin
Haal veranderingen op

21. git pull origin
Haal veranderingen op + merge

22. echo “# Hello Remote 3” > README.md
git add README.md
git commit -m “update readme”
git push
Push naar remote server

24. git tag -a “0.0.1” -m “first tag”
git tag
git push --tags
Maak een tag

25. Maak een branch
git branch testing
git branch

26. Switch branch
git checkout testing
git branch

27. Werk verder op branch
echo ‘puts "Hello World"’> hello.rb
git add hello.rb
git commit -m “add greeting”

28. Terug naar master
git checkout master
cat hello.rb

29. Werk verder op master
echo ‘puts "Hello Craftworkz"’ > hello.rb
git add hello.rb
git commit -m “add new hello world”

31. GITK

32. IDE (Eclipse, IntelliJ, Visual Studio…)

33. Gitlab

34. SourceTree

35. Github for mac / windows

36. Gerrit

37. Samenvatting
● Leer de Command Line tool
● Gebruik altijd .gitignore file
● Push zaken die samenhoren, geef
duidelijke commit messages

38. Best practices
● Check-in code min. 1x per dag
● Wees niet bang van branches
● Herschrijf de geschiedenis niet

39. Links
● http://www.git-scm.com
● http://www.github.com
● http://try.github.io
● http://www.bitbucket.com
● https://hub.jazz.net
● http://stackoverflow.com/questions/tagged/git
● http://gitref.org
● https://about.gitlab.com
● https://www.atlassian.com/software/sourcetree/overview
● https://www.gerritcodereview.com

40. Videos
● https://www.parleys.com/tutorial/advanced-git-github
● https://www.youtube.com/watch?v=vDv5K5PbvO8
● https://www.youtube.com/watch?v=73I5dRucCds
● http://www.infoq.com/presentations/git-index
● https://www.codeschool.com/courses/git-real

41. Books
Pro Git
https://git-scm.com/book/en/v2
(Gratis)
Pragmatic Guide To Git Git in Practice

42. Credits
● https://upload.wikimedia.org/wikipedia/commons/c/cc/Linus_Torvalds_flipped.jpg
● https://upload.wikimedia.org/wikipedia/commons/c/cb/Salix_cinerea_subsp._oleifolia_branch.jpg
● https://upload.wikimedia.org/wikipedia/commons/a/a1/Rusty_tools.JPG

43. THANK YOU!
Feedback: #craftcamps