Git Going for the Transylvania JUG

1. Introduction to Git at the Transylvania JUG by Matthew McCullough

2. Matthew McCullough @matthewmccull

4. Git

5. “Cool kids” version control system

6. Open Source

7. bash scripts ☛ C code

8. ≉

10. Git -noun British Slang. an unpleasant or contemptible person -Oxford English Dictionary “ ”

12. I'm an egotistical bastard, and I name all my projects after myself. First Linux, now git. -Linus Torvalds “ ”

13. ➡How to commit, branch and tag ➡How Git implements a new commit-referencing syntax ➡How to pull and push changes between repositories ➡How to set up a Git repository

14. ➡How to set up a Git repository

16. > cd myproj > git init Initialized empty Git repository in /stuff/myproj/.git/

17. ➡How to set up a Git repository

20. ➡How to commit, branch and tag

22. ➡How to commit

23. > git add <FILENAME>

24. Local Branches Remote Branches Upstream Branches Working Copy commit

25. > git status # On branch master # Initial commit # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # new file: myfile.txt

26. > git commit -m”<MESSAGE>” [master (root-commit) 498cc44] My first commit 1 files changed, 5 insertions(+), 0 deletions(-) create mode 100644 myfile.txt

27. ➡How to branch

28. > git branch <BRANCHNAME>

29. Local Branches Remote Branches Upstream Branches Working Copy Branches

30. > git checkout <BRANCHNAME> Switched to branch 'mybranch'

31. Local Branches Remote Branches Upstream Branches Working Copy Branches

32. Insane branch count?

33. Local Remote Upstream Integ Product Integ Product Integ Product

34. Local Remote Upstream Integ Product Integ Product Integ Product Idea Story Feature FeatureFeature

35. Local Remote Upstream Integ Product Integ Product Integ Product Idea Story Feature FeatureFeature

36. ➡How to tag

37. > git tag <TAGNAME>

38. > git tag -a <TAGNAME> -m”<MESSAGE>”

39. ➡How to commit, branch and tag

42. ➡How Git implements a new commit-referencing syntax

44. 9AB223D28B1AA46EF1780B22F304982E39872C34 <html> <body> <p>This is a test</p> <img src="http://ai.com/icon.gif"> </body> </html>

45. > git log commit 0fc27c73dea82a0576c6cf262fb517d24e75a223 Author: Matthew McCullough <matthewm@ambientideas.com> Date: Mon Oct 24 10:42:20 2013 +0300 Performance enhancement of calc engine commit 7d946e814233814b1780ed1035da271cbb37206d Author: Matthew McCullough <matthewm@ambientideas.com> Date: Mon Oct 24 12:59:41 2013 +0300 Translation to Esperanto

46. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob: 8d162 logo.jpg blob: 51d22 draw.js 7e8b1commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob<html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

47. Hashes tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob: 8d162 logo.jpg blob: 51d22 draw.js 7e8b1commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob<html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

55. v1 v2 v3 commit tree: 9a87b parent: nil author: Fird committer: Matthew message: Major refactoring of the Javascript rendering engine. c67db commit tree: b22c1 parent: c67db author: Tim committer: Fird message: Minor update to HTML 9bd21 commit tree: b22c1 parent: 9bd21 author: Johnny committer: Joe message: New language transations 1c2d7

63. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit 8c2d1 commit 1bdcd commit 2daa1

69. ➡How Git implements a new commit-referencing syntax

72. ➡How to pull and push changes between repositories

74. > git clone http://this.com/myproj.git > cd myproj Cloning into hellogitworld... remote: Counting objects: 3871, done. remote: Compressing objects: 100% (73/73), done. remote: Total 3871 (delta 51), reused 3853 (delta 36) Receiving objects: 100% (3871/3871), 297.88 KiB | 35 KiB/s, done. Resolving deltas: 100% (51/51), done.

75. Local Branches Remote Branches Upstream Branches Working Copy merge merge commit fetch push clone clone clone push pull pull pull

76. Central Repo Centralized

77. Blessed Repo Dictatorship

78. Certiﬁed Repo Development Repo IntegrationManaged Continuous Integration Server

79. ➡How to pull and push changes between repositories

81. Introduction to Git & Gerrit at the Transylvania JUG by Matthew McCullough

Git Going for the Transylvania JUG

Recommended

Recommended

More Related Content

What's hot

What's hot (20)

Viewers also liked

Viewers also liked (6)

Similar to Git Going for the Transylvania JUG

Similar to Git Going for the Transylvania JUG (20)

More from Matthew McCullough

More from Matthew McCullough (20)

Recently uploaded

Recently uploaded (20)

Git Going for the Transylvania JUG