Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Intro to Git and Gerrit at the London JUG

Matthew McCullough
October 20, 2011
Programming
7
540

Intro to Git and Gerrit at the London JUG

Matthew McCullough, Git Trainer at GitHub and Alex Blewitt introduce Git and Gerrit to the London JUG in October of 2011.

1) Great GitHub help pages:
http://help.github.com

2) A wonderful open source Git book from Scott Chacon:
http://progit.org

3) A free one-hour intro session offered approximately every one to four weeks:
https://github.com/blog/942-october-the-basics-of-github-free-class-dates

4) Office hours in which any Git or GitHub questions can be asked in a chat room:
https://github.com/blog/910-github-office-hours

5) A full day Git bootcamp class:
Training details and registration: http://github.com/training/online
Brochure link: http://dl.dropbox.com/u/53401/github/GitHub-Git-Training-Flyer-v2.0.pdf

6) On-site custom Git training.
http://github.com/training

7) O'Reiily's Git Master Class
http://bit.ly/ogitvid

Matthew McCullough

October 20, 2011
Tweet

More Decks by Matthew McCullough

See All by Matthew McCullough
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
matthewmccullough
1
360
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
140
Git and GitHub Platform Review
matthewmccullough
1
320
Your First Pull Request
matthewmccullough
0
260
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
720
Agile-ish life at GitHub
matthewmccullough
2
310
Git and GitHub Agile Workflows for HP
matthewmccullough
0
250
Writing Tools on the GitHub Platform
matthewmccullough
0
220
Git Feature Branches as an Art
matthewmccullough
0
140

Other Decks in Programming

See All in Programming
Zero Waste, Radical Magic, and Italian Graft – Quarkus Efficiency Secrets
hollycummins
0
220
Javaエンジニアのための Nodejs/Nuxt3入門
hidekatsu_izuno
0
280
[技育CAMPアカデミア]アイディアを形に！【超入門】スマホアプリ開発〜リリースまでの流れをご紹介
teamlab
PRO
0
350
Netty Chicago Java User Group 2024-04-17
sullis
0
140
Milestoner
bkuhlmann
1
400
ゆるい個人開発のススメ
kuroppe1819
10
950
try!Swift Tokyo 2024 参加報告 LT
akidon0000
1
200
単体テストを書かない技術 #phpcon_odawara
o0h
PRO
26
7.9k
エンターテイメント業界で利用されるAWS
demuyan
0
200
코틀린으로 멀티플랫폼 만들기
pangmoo
0
120
Elm Form Validation
bkuhlmann
0
510
if constexpr文はテンプレート世界のラムダ式である
faithandbrave
2
260

Featured

See All Featured
YesSQL, Process and Tooling at Scale
rocio
163
13k
The Mythical Team-Month
searls
215
42k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
19
1.9k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
352
28k
BBQ
matthewcrist
80
8.7k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
1
1.3k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
226
51k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
77
41k
The Invisible Customer
myddelton
114
12k
How To Stay Up To Date on Web Technology
chriscoyier
782
250k
Become a Pro
speakerdeck
PRO
10
4.5k
Embracing the Ebb and Flow
colly
79
4.1k

Transcript

  1. Introduction to Git & Gerrit at the London JUG by

    Matthew McCullough and Alex Blewitt

  2. Matthew McCullough @matthewmccull

  3. None
  4. None
  5. None
  6. None
  7. None

  8. Git

  9. None

  10. “Cool kids” version control system

  11. Open Source

  12. bash scripts ☛ C code

  13. ≉

  14. None

  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

  20. None

  21. > cd myproj > git init Initialized empty Git repository

    in /stuff/myproj/.git/
  22. None
  23. None

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

  25. ➡How to commit, branch and tag

  26. The three basics

  27. None

  28. ➡How to commit

  29. > git add <FILENAME>

  30. None

  31. > git status # On branch master # Initial commit

    # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # new file: myfile.txt
  32. None

  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

  35. None

  36. ➡How to branch

  37. > git branch <BRANCHNAME>

  38. Local Branches Remote Branches Upstream Branches Working Copy

  39. None

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

  41. Local Branches Remote Branches Upstream Branches Working Copy

  42. None

  43. ➡How to tag

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

  45. None
  46. None

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

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

  49. None

  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 7e8b1 commit 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

  52. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

  53. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

  54. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

  56. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

  57. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

  58. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

  59. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit 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

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

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

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

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

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

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

  69. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  70. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  71. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  72. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  73. 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 <[email protected]> Date:

    Mon Oct 24 10:42:20 2013 +0300 Performance enhancement of calc engine commit 7d946e814233814b1780ed1035da271cbb37206d Author: Matthew McCullough <[email protected]> Date: Mon Oct 24 12:59:41 2013 +0300 Translation to Esperanto
  75. None
  76. None

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

  78. ➡How to pull and push changes between repositories

  79. None

  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
  82. None

  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 push push

    commit
  85. None

  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
  88. None
  89. None

  90. Next: Alex Blewitt on Gerrit

  91. None

  92. Introduction to Git & Gerrit at the London JUG by

    Matthew McCullough and Alex Blewitt