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

Git Going for the Transylvania JUG

Matthew McCullough
October 18, 2011
Programming
6
950

Git Going for the Transylvania JUG

Matthew McCullough presenting Git to the Transylvania Java Users Group in October of 2011.

Matthew McCullough

October 18, 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
370
Collaborative Software Development in a Social World at the Utah JUG
matthewmccullough
2
150
Git and GitHub Platform Review
matthewmccullough
1
400
Your First Pull Request
matthewmccullough
0
270
Git and GitHub Workflows at the Utah JUG
matthewmccullough
1
770
Agile-ish life at GitHub
matthewmccullough
2
340
Git and GitHub Agile Workflows for HP
matthewmccullough
0
270
Writing Tools on the GitHub Platform
matthewmccullough
0
240
Git Feature Branches as an Art
matthewmccullough
0
150

Other Decks in Programming

See All in Programming
Why Jakarta EE Matters to Spring - and Vice Versa
ivargrimstad
0
1.3k
Tauriでネイティブアプリを作りたい
tsucchinoko
0
380
イマのCSSでできる
インタラクション最前線 + CSS最新情報
clockmaker
5
2.7k
광고 소재 심사 과정에 AI를 도입하여 광고 서비스 생산성 향상시키기
kakao
PRO
0
180
[Do iOS '24] Ship your app on a Friday...and enjoy your weekend!
polpielladev
0
110
A Journey of Contribution and Collaboration in Open Source
ivargrimstad
0
1.1k
WebフロントエンドにおけるGraphQL（あるいはバックエンドのAPI）との向き合い方 / #241106_plk_frontend
izumin5210
4
1.4k
flutterkaigi_2024.pdf
kyoheig3
0
170
Streams APIとTCPフロー制御 / Web Streams API and TCP flow control
tasshi
2
360
デザインパターンで理解するLLMエージェントの作り方 / How to develop an LLM agent using agentic design patterns
rkaga
9
930
3rd party scriptでもReactを使いたい！ Preact + Reactのハイブリッド開発
righttouch
PRO
1
610
ヤプリ新卒SREの オンボーディング
masaki12
0
130

Featured

See All Featured
Scaling GitHub
holman
458
140k
RailsConf 2023
tenderlove
29
900
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
126
18k
Six Lessons from altMBA
skipperchong
27
3.5k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
169
50k
A Tale of Four Properties
chriscoyier
156
23k
Docker and Python
trallard
40
3.1k
The Cost Of JavaScript in 2023
addyosmani
45
6.8k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
246
1.3M
YesSQL, Process and Tooling at Scale
rocio
169
14k
VelocityConf: Rendering Performance Case Studies
addyosmani
325
24k
Bootstrapping a Software Product
garrettdimon
PRO
305
110k

Transcript

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

  2. Matthew McCullough @matthewmccull

  3. None

  4. Git

  5. “Cool kids” version control system

  6. Open Source

  7. bash scripts ☛ C code

  8. ≉

  9. None

  10. Git -noun British Slang. an unpleasant or contemptible person -Oxford

    English Dictionary “ ”
  11. None

  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

  15. None

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

    in /stuff/myproj/.git/

  17. ➡How to set up a Git repository

  18. None

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

  20. ➡How to commit, branch and tag

  21. None

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

  35. Local Remote Upstream Integ Product Integ Product Integ Product Idea

    Story Feature Feature Feature

  36. ➡How to tag

  37. > git tag <TAGNAME>

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

  39. ➡How to commit, branch and tag

  40. None

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

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

  43. None

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

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

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

  48. Hashes 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

  49. Hashes 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

  50. Hashes 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

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

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

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

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

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

  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. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

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

    8c2d1 commit 1bdcd commit 2daa1

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

    8c2d1 commit 1bdcd commit 2daa1

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

    8c2d1 commit 1bdcd commit 2daa1

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

    8c2d1 commit 1bdcd commit 2daa1

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

  70. None

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

  72. ➡How to pull and push changes between repositories

  73. None

  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 C e n t r a l i

    z e d

  77. Blessed Repo D i c t a t o r

    s h i p

  78. Certified Repo Development Repo I n t e g r

    a t i o n M a n a g e d Continuous Integration Server

  79. ➡How to pull and push changes between repositories

  80. None

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

    Matthew McCullough