Slide 1
Slide 1 text
Introduction to
Git & GitHub
by Matthew McCullough
Slide 2
Slide 2 text
Matthew McCullough
@matthewmccull
Slide 3
Slide 3 text
No content
Slide 4
Slide 4 text
No content
Slide 5
Slide 5 text
No content
Slide 6
Slide 6 text
No content
Slide 7
Slide 7 text
No content
Slide 8
Slide 8 text
a brief history of
Git
Slide 9
Slide 9 text
No content
Slide 10
Slide 10 text
“Cool kids” version control system
Slide 11
Slide 11 text
Open Source
Slide 12
Slide 12 text
bash scripts
☛ C code
Slide 13
Slide 13 text
≉
Slide 14
Slide 14 text
No content
Slide 15
Slide 15 text
I'm an egotistical bastard, and
I name all my projects
after myself. First Linux,
now
git.
-Linus Torvalds
“
”
Slide 16
Slide 16 text
GitHub
a RIA for Git
Slide 17
Slide 17 text
Social coding, within the Enterprise
Slide 18
Slide 18 text
No content
Slide 19
Slide 19 text
Version control as a virtual appliance
Slide 20
Slide 20 text
No content
Slide 21
Slide 21 text
Desktop tools as HTML5 components
Slide 22
Slide 22 text
No content
Slide 23
Slide 23 text
In-browser syntax highlighted code editing
Slide 24
Slide 24 text
No content
Slide 25
Slide 25 text
Conversations on proposed code changes
Slide 26
Slide 26 text
No content
Slide 27
Slide 27 text
No content
Slide 28
Slide 28 text
setting up a
Git Repo
Slide 29
Slide 29 text
No daemon
Slide 30
Slide 30 text
No special repo area
Slide 31
Slide 31 text
No content
Slide 32
Slide 32 text
> cd myproj
> git init
Initialized empty Git repository
in /stuff/myproj/.git/
Slide 33
Slide 33 text
Deltas
vs. Copies
Slide 34
Slide 34 text
Typical SCMs use deltas
Slide 35
Slide 35 text
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
Slide 36
Slide 36 text
CVS, Subversion, darcs & Mercurial
Slide 37
Slide 37 text
No content
Slide 38
Slide 38 text
Checkin
Checkin
Checkin
Checkin
Checkin
Checkin
Checkin
Checkin
Checkin
Checkin
Checkin
Delta storage gets slower as the history
of a file gets longer
Slide 39
Slide 39 text
Git uses Directed Acyclic Graph storage
Slide 40
Slide 40 text
cp -r srcfolder srcfolder.prev
Slide 41
Slide 41 text
Copy of the entire tree per checkin
Slide 42
Slide 42 text
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
Slide 43
Slide 43 text
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
Slide 44
Slide 44 text
hardlinks to existing identical blobs
Slide 45
Slide 45 text
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
Slide 46
Slide 46 text
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
Slide 47
Slide 47 text
zlib deflates every blob at commit
Slide 48
Slide 48 text
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
Slide 49
Slide 49 text
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
Slide 50
Slide 50 text
zlib deflates entire repo
Slide 51
Slide 51 text
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
Slide 52
Slide 52 text
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
Slide 53
Slide 53 text
2100 MB became
205 MB
Act I
Slide 54
Slide 54 text
Add and
Commit
Slide 55
Slide 55 text
No content
Slide 56
Slide 56 text
Working Staging Repo
checkout
add
commit
Slide 57
Slide 57 text
No content
Slide 58
Slide 58 text
> git add
Slide 59
Slide 59 text
No content
Slide 60
Slide 60 text
> git status
# On branch master
# Initial commit
# Changes to be committed:
# (use "git rm --cached ..." to unstage)
# new file: myfile.txt
Slide 61
Slide 61 text
No content
Slide 62
Slide 62 text
> git commit -m””
[master (root-commit) 498cc44] My first commit
1 files changed, 5 insertions(+), 0 deletions(-)
create mode 100644 myfile.txt
Slide 63
Slide 63 text
Local
Branches
Remote
Branches
Upstream
Branches
Working
Copy
commit
Slide 64
Slide 64 text
Branch and
Checkout
Slide 65
Slide 65 text
No content
Slide 66
Slide 66 text
> git branch
Slide 67
Slide 67 text
Local
Branches
Remote
Branches
Upstream
Branches
Working
Copy
Slide 68
Slide 68 text
Local
Branches
Remote
Branches
Upstream
Branches
Working
Copy
Slide 69
Slide 69 text
No content
Slide 70
Slide 70 text
> git checkout
Switched to branch 'mybranch'
Slide 71
Slide 71 text
Local
Branches
Remote
Branches
Upstream
Branches
Working
Copy
Slide 72
Slide 72 text
Local
Branches
Remote
Branches
Upstream
Branches
Working
Copy
Slide 73
Slide 73 text
Commit
Ref Syntax
Slide 74
Slide 74 text
No content
Slide 75
Slide 75 text
9AB223D28B1AA46EF1780B22F304982E39872C34
This is a test
Slide 76
Slide 76 text
9AB223D28B1AA46EF1780B22F304982E39872C34
This is a test
Slide 77
Slide 77 text
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
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
Slide 78
Slide 78 text
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
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
Slide 79
Slide 79 text
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
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
Slide 80
Slide 80 text
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
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
Slide 81
Slide 81 text
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
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
Slide 82
Slide 82 text
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
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
Slide 83
Slide 83 text
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
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
Slide 84
Slide 84 text
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
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
Slide 85
Slide 85 text
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
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
Slide 86
Slide 86 text
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
Slide 87
Slide 87 text
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
Slide 88
Slide 88 text
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
Slide 89
Slide 89 text
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
Slide 90
Slide 90 text
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
Slide 91
Slide 91 text
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
Slide 92
Slide 92 text
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
Slide 93
Slide 93 text
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
Slide 94
Slide 94 text
Distributed
Connectivity
Slide 95
Slide 95 text
developer A
Slide 96
Slide 96 text
developer A developer B
Slide 97
Slide 97 text
developer A developer B
Slide 98
Slide 98 text
developer A developer B
Slide 99
Slide 99 text
blessed repo
developer A developer B
Slide 100
Slide 100 text
Workflows
and collaboration
Slide 101
Slide 101 text
Central
Repo
C e n t r a l i z e d
Slide 102
Slide 102 text
Central
Repo
C e n t r a l i z e d
Slide 103
Slide 103 text
Blessed
Repo
D i c t a t o r s h i p
Slide 104
Slide 104 text
Blessed
Repo
D i c t a t o r s h i p
Slide 105
Slide 105 text
Blessed
Repo
D i c t a t o r s h i p
Slide 106
Slide 106 text
Blessed
Repo
D i c t a t o r s h i p
Slide 107
Slide 107 text
Blessed
Repo
D i c t a t o r s h i p
Slide 108
Slide 108 text
Certified
Repo
Development
Repo
I n t e g r a t i o n M a n a g e d
Slide 109
Slide 109 text
Certified
Repo
Development
Repo
I n t e g r a t i o n M a n a g e d
Slide 110
Slide 110 text
Certified
Repo
Development
Repo
I n t e g r a t i o n M a n a g e d
Slide 111
Slide 111 text
Certified
Repo
Development
Repo
I n t e g r a t i o n M a n a g e d
Slide 112
Slide 112 text
Mirror
Development
Repo
M i r r o r e d
Mirror
Certified
Repo
Slide 113
Slide 113 text
Mirror
Development
Repo
M i r r o r e d
Mirror
Certified
Repo
Slide 114
Slide 114 text
C u s t o m + P u b l i c C o n t r i b
☚ Private Public ☛
GitHub
Slide 115
Slide 115 text
C u s t o m + P u b l i c C o n t r i b
☚ Private Public ☛
GitHub
Slide 116
Slide 116 text
C u s t o m + P u b l i c C o n t r i b
Customized
☚ Private Public ☛
GitHub
Slide 117
Slide 117 text
C u s t o m + P u b l i c C o n t r i b
Customized
☚ Private Public ☛
GitHub
Slide 118
Slide 118 text
Git’s
notable users
Slide 119
Slide 119 text
No content
Slide 120
Slide 120 text
No content
Slide 121
Slide 121 text
No content
Slide 122
Slide 122 text
No content
Slide 123
Slide 123 text
No content
Slide 124
Slide 124 text
No content
Slide 125
Slide 125 text
Introduction to
Git & GitHub
by Matthew McCullough