Intro to Git and Gerrit at the London JUG

1. Introduction to Git & Gerrit at the London JUG by Matthew McCullough and Alex Blewitt

2. Matthew McCullough @matthewmccull

8. Git

10. “Cool kids” version control system

11. Open Source

12. bash scripts ☛ C code

13. ≉

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

16. ➡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

17. ➡How to set up a Git repository

18. No daemon

19. No special repo area

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

25. ➡How to commit, branch and tag

26. The three basics

28. ➡How to commit

29. > git add <FILENAME>

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

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

34. Local Branches Remote Branches Upstream Branches Working Copy commit

36. ➡How to branch

37. > git branch <BRANCHNAME>

38. Local Branches Remote Branches Upstream Branches Working Copy

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

41. Local Branches Remote Branches Upstream Branches Working Copy

43. ➡How to tag

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

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

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

51. 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

60. 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

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

74. > 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

78. ➡How to pull and push changes between repositories

80. > git clone http://this.com/myproj.git Cloning into myproj... 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. > cd myproj

81. Local Branches Remote Branches Upstream Branches Working Copy clone clone clone

83. > git push Counting objects: 16, done. Delta compression using up to 2 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (15/15), 1.37 KiB, done. Total 15 (delta 5), reused 0 (delta 0) To http://this.com/myproj.git 6128b94..7607971 master -> master

84. Local Branches Remote Branches Upstream Branches Working Copy pushpush commit

86. > git pull Updating 474f43d..7607971 Fast-forward sample5.htm | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 sample5.htm

87. Local Branches Remote Branches Upstream Branches Working Copy pull pull pull

90. Next: Alex Blewitt on Gerrit

92. Introduction to Git & Gerrit at the London JUG by Matthew McCullough and Alex Blewitt

Intro to Git and Gerrit at the London JUG

Recommandé

Recommandé

Contenu connexe

Plus de Matthew McCullough

Plus de Matthew McCullough (20)

Dernier

Dernier (20)

Intro to Git and Gerrit at the London JUG