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

Intro to Git and GitHub

Matthew McCullough
March 05, 2012
Programming
13
5.1k

Intro to Git and GitHub

Are you curious what Git and GitHub are? Let Matthew McCullough of GitHub show you in just a few short minutes and a series of instructive graphics.

Matthew McCullough

March 05, 2012
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
Folding Cheat Sheet #3
philipschwarz
PRO
0
110
try! Swift Tokyo 初参加報告LT
hinakko2
0
190
[SF Ruby, March 2024] Rails on Wasm
palkan
0
370
ONE WEDGE_company_guide
1wedge_one
0
380
Folding Cheat Sheet #2
philipschwarz
PRO
0
110
Rubyでたのしむクリエイティブコーディング/Enjoy Creative coding with Ruby
chobishiba
1
160
AWS Application Composerで始める、 サーバーレスなデータ基盤構築 / 20240406-jawsug-hokuriku-shinkansen
kasacchiful
1
250
HUIT新歓2024「競技プログラミング、やってみませんか？」
slephy2784
1
250
코틀린으로 멀티플랫폼 만들기
pangmoo
0
120
GraphQLサーバの構成要素を整理する #ハッカー鮨 #tsukijigraphql / graphql server technology selection
izumin5210
1
180
コーンフレークから始める モデリング会話入門
ogurotakayuki
0
280
Zero Waste, Radical Magic, and Italian Graft – Quarkus Efficiency Secrets
hollycummins
0
220

Featured

See All Featured
Git: the NoSQL Database
bkeepers
PRO
422
63k
4 Signs Your Business is Dying
shpigford
175
21k
個人開発の失敗を避けるイケてる考え方 / tips for indie hackers
panda_program
60
14k
Making Projects Easy
brettharned
108
5.5k
A better future with KSS
kneath
231
16k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
13
1.5k
Web Components: a chance to create the future
zenorocha
305
41k
Building a Scalable Design System with Sketch
lauravandoore
455
32k
Building Flexible Design Systems
yeseniaperezcruz
318
37k
Art, The Web, and Tiny UX
lynnandtonic
288
19k
How STYLIGHT went responsive
nonsquared
92
4.8k
KATA
mclloyd
14
12k

Transcript

  1. Introduction to Git & GitHub by Matthew McCullough

  2. Matthew McCullough @matthewmccull

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

  8. a brief history of 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. GitHub a RIA for Git

  17. Social coding, within the Enterprise

  18. None

  19. Version control as a virtual appliance

  20. None

  21. Desktop tools as HTML5 components

  22. None

  23. In-browser syntax highlighted code editing

  24. None

  25. Conversations on proposed code changes

  26. None
  27. None

  28. setting up a Git Repo

  29. No daemon

  30. No special repo area

  31. None

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

    in /stuff/myproj/.git/

  33. Deltas vs. Copies

  34. Typical SCMs use deltas

  35. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B

  36. CVS, Subversion, darcs & Mercurial

  37. None

  38. Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin Checkin

    Checkin Delta storage gets slower as the history of a file gets longer

  39. Git uses Directed Acyclic Graph storage

  40. cp -r srcfolder srcfolder.prev

  41. Copy of the entire tree per checkin

  42. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  43. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  44. hardlinks to existing identical blobs

  45. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  46. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  47. zlib deflates every blob at commit

  48. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  49. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  50. zlib deflates entire repo

  51. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  52. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  53. 2100 MB became 205 MB Act I

  54. Add and Commit

  55. None

  56. Working Staging Repo checkout add commit

  57. None

  58. > git add <FILENAME>

  59. None

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

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

  62. > git commit -m”<MESSAGE>” [master (root-commit) 498cc44] My first commit

    1 files changed, 5 insertions(+), 0 deletions(-) create mode 100644 myfile.txt

  63. Local Branches Remote Branches Upstream Branches Working Copy commit

  64. Branch and Checkout

  65. None

  66. > git branch <BRANCHNAME>

  67. Local Branches Remote Branches Upstream Branches Working Copy

  68. Local Branches Remote Branches Upstream Branches Working Copy

  69. None

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

  71. Local Branches Remote Branches Upstream Branches Working Copy

  72. Local Branches Remote Branches Upstream Branches Working Copy

  73. Commit Ref Syntax

  74. None

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

    </body> </html>

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

    </body> </html>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  94. Distributed Connectivity

  95. developer A

  96. developer A developer B

  97. developer A developer B

  98. developer A developer B

  99. blessed repo developer A developer B

  100. Workflows and collaboration

  101. Central Repo C e n t r a l i

    z e d

  102. Central Repo C e n t r a l i

    z e d

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

    s h i p

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

    s h i p

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

    s h i p

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

    s h i p

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

    s h i p

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

    a t i o n M a n a g e d

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

    a t i o n M a n a g e d

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

    a t i o n M a n a g e d

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

    a t i o n M a n a g e d

  112. Mirror Development Repo M i r r o r e

    d Mirror Certified Repo

  113. Mirror Development Repo M i r r o r e

    d Mirror Certified Repo

  114. C u s t o m + P u b

    l i c C o n t r i b ☚ Private Public ☛ GitHub

  115. C u s t o m + P u b

    l i c C o n t r i b ☚ Private Public ☛ GitHub

  116. C u s t o m + P u b

    l i c C o n t r i b Customized ☚ Private Public ☛ GitHub

  117. C u s t o m + P u b

    l i c C o n t r i b Customized ☚ Private Public ☛ GitHub

  118. Git’s notable users

  119. None
  120. None
  121. None
  122. None
  123. None
  124. None

  125. Introduction to Git & GitHub by Matthew McCullough