Tweet
Tweet

Slide 1

Slide 1 text

Getting Git Scott Chacon

Slide 2

Slide 2 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min

Slide 3

Slide 3 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m This Slide 10% 4 min

Slide 4

Slide 4 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Who is Scott? 10% 4 min

Slide 5

Slide 5 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 3m What is Git?

Slide 6

Slide 6 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 20m How Does Git Work?

Slide 7

Slide 7 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 12m How Do I Use Git?

Slide 8

Slide 8 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 4m How Do I Deploy with Git? 15% 6 min

Slide 9

Slide 9 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Where Can I Learn More? 15% 6 min

Slide 10

Slide 10 text

Who Is Scott? Introducing myself...

Slide 11

Slide 11 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Who is Scott? 10% 4 min

Slide 12

Slide 12 text

Scott Anthony Chacon

Slide 13

Slide 13 text

github.com/schacon

Slide 14

Slide 14 text

No content

Slide 15

Slide 15 text

www.gitcasts.com

Slide 16

Slide 16 text

No content

Slide 17

Slide 17 text

Rails Git Xen 3D Cameras Huge Flat Screens jepoirrier@flickr

Slide 18

Slide 18 text

No content

Slide 19

Slide 19 text

me

Slide 20

Slide 20 text

introduce yourself

Slide 21

Slide 21 text

introduce yourself and your sweet projects...

Slide 22

Slide 22 text

why is scott here?

Slide 23

Slide 23 text

What is Git?

Slide 24

Slide 24 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 3m What is Git?

Slide 25

Slide 25 text

git is

Slide 26

Slide 26 text

directory content management system git is

Slide 27

Slide 27 text

tree history storage system git is

Slide 28

Slide 28 text

stupid content tracker git is

Slide 29

Slide 29 text

a toolkit git is

Slide 30

Slide 30 text

No content

Slide 31

Slide 31 text

No content

Slide 32

Slide 32 text

the “plumbing”

Slide 33

Slide 33 text

No content

Slide 34

Slide 34 text

No content

Slide 35

Slide 35 text

the “porcelain”

Slide 36

Slide 36 text

No content

Slide 37

Slide 37 text

not subversion! git is

Slide 38

Slide 38 text

forget subversion!

Slide 39

Slide 39 text

not an evolution

Slide 40

Slide 40 text

svn rcs cvs git not an evolution

Slide 41

Slide 41 text

svn rcs cvs git not an evolution

Slide 42

Slide 42 text

svn rcs cvs git not an evolution

Slide 43

Slide 43 text

source control taxonomy

Slide 44

Slide 44 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 45

Slide 45 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 46

Slide 46 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 47

Slide 47 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 48

Slide 48 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 49

Slide 49 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 50

Slide 50 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 51

Slide 51 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 52

Slide 52 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 53

Slide 53 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 54

Slide 54 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 55

Slide 55 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 56

Slide 56 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 57

Slide 57 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 58

Slide 58 text

source control taxonomy delta storage file A !1 file B file C C1 C2 C3 C4 C5 !2 !1 !2 !1 !2 !3 A B C C1 C2 C3 C4 C5 A1 B C1 A1 B C2 A2 B1 C2 A2 B2 C3 DAG storage

Slide 59

Slide 59 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 60

Slide 60 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 61

Slide 61 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 62

Slide 62 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 63

Slide 63 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 64

Slide 64 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 65

Slide 65 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 66

Slide 66 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy

Slide 67

Slide 67 text

svn cvs git perforce mercurial time machine cp -r rcs source control taxonomy darcs delta storage DAG storage bazzar bitkeeper local centralized distributed local centralized distributed source control taxonomy bazaar

Slide 68

Slide 68 text

How Does Git Work?

Slide 69

Slide 69 text

How Does Git Work? ?

Slide 70

Slide 70 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 20m How Does Git Work?

Slide 71

Slide 71 text

git

Slide 72

Slide 72 text

git directory

Slide 73

Slide 73 text

git directory .git

Slide 74

Slide 74 text

git directory .git GIT_DIR

Slide 75

Slide 75 text

Git Directory config file hooks index object database references

Slide 76

Slide 76 text

object database

Slide 77

Slide 77 text

object database content

Slide 78

Slide 78 text

object database new_content = type + ’ ‘ + content.size + \0 + content content

Slide 79

Slide 79 text

object database new_content = type + ’ ‘ + content.size + \0 + content content “header”

Slide 80

Slide 80 text

object database new_content = type + ’ ‘ + content.size + \0 + content sha = Digest::SHA1.hexdigest(new_content) content

Slide 81

Slide 81 text

object database new_content = type + ’ ‘ + content.size + \0 + content sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...”

Slide 82

Slide 82 text

object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...”

Slide 83

Slide 83 text

object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...” path = “.git/objects/82/4aed035c0aa75d64c...”

Slide 84

Slide 84 text

object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...” path = “.git/objects/82/4aed035c0aa75d64c...” File.open(path, ‘w’) {|f| f.write(compressed)}

Slide 85

Slide 85 text

object database new_content = type + ’ ‘ + content.size + \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...” path = “.git/objects/82/4aed035c0aa75d64c...” File.open(path, ‘w’) {|f| f.write(compressed)} “loose” format

Slide 86

Slide 86 text

object database git gc

Slide 87

Slide 87 text

object database git gc same file with minor differences

Slide 88

Slide 88 text

object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... same file with minor differences

Slide 89

Slide 89 text

object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... .git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same file with minor differences

Slide 90

Slide 90 text

object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... .git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same file with minor differences

Slide 91

Slide 91 text

object database .git/objects/f1/032eed02413a1145c... git gc .git/objects/45/b983be36b73c0788d... .git/objects/04/fb8aee105e6e445e8... .git/objects/63/874f37013c1740acd... .git/objects/1d/c9cbcb76cbb80fce1... .git/objects/82/4aed035c0aa75d64c... .git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same file with minor differences “packed” format

Slide 92

Slide 92 text

object database all git objects are stored this way

Slide 93

Slide 93 text

object database new_content = type + ’ ‘ + content.size + \0 + content 4 types of git objects

Slide 94

Slide 94 text

object database blob

Slide 95

Slide 95 text

object database blob tree

Slide 96

Slide 96 text

object database commit blob tree

Slide 97

Slide 97 text

object database commit tag blob tree

Slide 98

Slide 98 text

object database blob

Slide 99

Slide 99 text

Rakele README simplegit.rb ./ lib/ blob : a874b7 blob : a906cb blob : a0a60a Working Directory Git Directory object database blob

Slide 100

Slide 100 text

object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb zlib::deflate

Slide 101

Slide 101 text

object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content zlib::deflate

Slide 102

Slide 102 text

object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content header zlib::deflate

Slide 103

Slide 103 text

object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content header compress zlib::deflate

Slide 104

Slide 104 text

object database { SimpleGit Ruby Library ====================== This library calls git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inflate blob : a906cb content header compress object zlib::deflate

Slide 105

Slide 105 text

object database commit tag blob tree

Slide 106

Slide 106 text

object database tree

Slide 107

Slide 107 text

object database tree Rakele README simplegit.rb ./ lib/ blob : a874b7 blob : a906cb blob : a0a60a Working Directory Git Directory

Slide 108

Slide 108 text

object database tree Rakele README simplegit.rb ./ lib/ tree : 1a738d tree : fe8971 Working Directory Git Directory blob : a874b7 blob : a906cb blob : a0a60a

Slide 109

Slide 109 text

object database { 100644 blob a906cb README 100644 blob a874b7 Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate zlib::deflate

Slide 110

Slide 110 text

object database { 100644 blob a906cb README 100644 blob a874b7 Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate filename “inode” info zlib::deflate

Slide 111

Slide 111 text

object database { 100644 blob a906cb README 100644 blob a874b7 Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate “block pointer” type mode zlib::deflate

Slide 112

Slide 112 text

object database commit tag blob tree

Slide 113

Slide 113 text

object database commit

Slide 114

Slide 114 text

commit tree blob tree tree blob blob branch HEAD object database commit

Slide 115

Slide 115 text

object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon 1205624433 committer Scott Chacon 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate

Slide 116

Slide 116 text

object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon 1205624433 committer Scott Chacon 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate

Slide 117

Slide 117 text

object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon 1205624433 committer Scott Chacon 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate

Slide 118

Slide 118 text

object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon 1205624433 committer Scott Chacon 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate

Slide 119

Slide 119 text

object database { Zlib::Inflate tree e1b3ec parent a11bef author Scott Chacon 1205624433 committer Scott Chacon 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deflate

Slide 120

Slide 120 text

blob branch commit remote tree tag object database

Slide 121

Slide 121 text

object database commit tag blob tree

Slide 122

Slide 122 text

object database tag

Slide 123

Slide 123 text

blob branch HEAD commit remote tree tag object database tag

Slide 124

Slide 124 text

object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate

Slide 125

Slide 125 text

object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate

Slide 126

Slide 126 text

object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate

Slide 127

Slide 127 text

object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate

Slide 128

Slide 128 text

object database { Zlib::Inflate object 0576fa type commit tag v0.1 tagger Scott Chacon 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deflate

Slide 129

Slide 129 text

object database commit tag blob tree

Slide 130

Slide 130 text

object database commit tag blob tree immutable

Slide 131

Slide 131 text

object database commit tag blob tree immutable can’t be muted

Slide 132

Slide 132 text

Git Directory config file hooks index object database references

Slide 133

Slide 133 text

references

Slide 134

Slide 134 text

blob branch HEAD commit remote tree tag references lightweight, movable pointers to a commit

Slide 135

Slide 135 text

blob branch HEAD commit remote tree tag references lightweight, movable pointers to a commit stored in .git/refs/* as simple files

Slide 136

Slide 136 text

blob branch HEAD commit remote tree tag references

Slide 137

Slide 137 text

the object model

Slide 138

Slide 138 text

commit tree blob tree tree blob blob branch HEAD

Slide 139

Slide 139 text

commit tree blob tree tree blob blob branch HEAD

Slide 140

Slide 140 text

commit tree blob tree tree blob blob branch HEAD

Slide 141

Slide 141 text

commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag

Slide 142

Slide 142 text

commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag

Slide 143

Slide 143 text

commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag

Slide 144

Slide 144 text

commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag

Slide 145

Slide 145 text

commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag

Slide 146

Slide 146 text

commit tree blob tree tree commit tree blob tree tree blob blob branch HEAD tag

Slide 147

Slide 147 text

commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD

Slide 148

Slide 148 text

commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD

Slide 149

Slide 149 text

commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD

Slide 150

Slide 150 text

commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD

Slide 151

Slide 151 text

commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD

Slide 152

Slide 152 text

commit tag tree blob tree tree commit tree blob tree tree blob commit tree blob blob branch HEAD

Slide 153

Slide 153 text

commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3

Slide 154

Slide 154 text

commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3

Slide 155

Slide 155 text

commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3

Slide 156

Slide 156 text

commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3

Slide 157

Slide 157 text

commit : a11bef tag : 0c819c tree : 1a738d tree : fe8971 blob : a874b7 blob : a906cb blob : a0a60a README Rakefile lib simplegit.rb $ git checkout v0.1 .git/refs/tags/v0.1 "0c819c" 1 2 3

Slide 158

Slide 158 text

the commit history

Slide 159

Slide 159 text

blob commit tree C1 } branch branch

Slide 160

Slide 160 text

branching and merging

Slide 161

Slide 161 text

C1 master C0 C2 C3 experiment HEAD

Slide 162

Slide 162 text

C1 master C0 C2 C3 experiment C3 C4 experiment C5 git checkout -b experiment HEAD

Slide 163

Slide 163 text

C1 master C0 C2 C3 experiment master 2 C3 C4 experiment C5 T1 git commit HEAD

Slide 164

Slide 164 text

C1 master C0 C2 C3 experiment C1 master C2 C3 C4 experiment C5 T1 git commit git commit HEAD

Slide 165

Slide 165 text

C1 master C0 C2 C3 experiment C1 master C2 C3 C4 experiment C5 T1 HEAD git checkout master

Slide 166

Slide 166 text

C1 master C0 C2 C3 C4 experiment C5 T1 C1 master C2 C3 C4 experiment C5 T1 git commit HEAD

Slide 167

Slide 167 text

C1 master C0 C2 C3 C4 experiment C5 T1 C1 master C2 C3 C4 experiment C5 T1 git tag -a ‘v1.1’ HEAD

Slide 168

Slide 168 text

C1 master C0 C2 C3 C4 experiment C5 T1 git checkout experiment git commit HEAD

Slide 169

Slide 169 text

C1 C0 C2 C3 C4 experiment C5 C6 master T1 git checkout master git merge experiment HEAD

Slide 170

Slide 170 text

remotes

Slide 171

Slide 171 text

C1 origin/master C0 C2 master C2 master

Slide 172

Slide 172 text

C1 origin/master C0 C2 master C2 master

Slide 173

Slide 173 text

C1 origin/master C0 C2 master C1 aster C2 master

Slide 174

Slide 174 text

git fetch origin CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2

Slide 175

Slide 175 text

CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 git fetch origin

Slide 176

Slide 176 text

CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 git checkout -b tryidea origin/master CL2 master CR3 CR4 in/idea CR2 tryidea CL3

Slide 177

Slide 177 text

CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 tryidea CL3 git merge origin/master origin/idea

Slide 178

Slide 178 text

CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2 tryidea CL3

Slide 179

Slide 179 text

CL1 origin/master C0 CL2 master CR3 CR1 CR4 origin/idea CR2

Slide 180

Slide 180 text

remote workflow

Slide 181

Slide 181 text

public repo local repo local repo public repo internet A B C

Slide 182

Slide 182 text

public repo local repo local repo public repo git push (ssh) internet A B C A B C

Slide 183

Slide 183 text

public repo local repo local repo public repo git push (ssh) git fetch (git) internet A B C A B C A B C

Slide 184

Slide 184 text

public repo local repo local repo public repo git push (ssh) git fetch (git) internet A B C A B C A B C D E F git commit

Slide 185

Slide 185 text

public repo local repo local repo public repo git push (ssh) git fetch (git) git push (ssh) internet A B C A B C A B C D E F A B C D E F

Slide 186

Slide 186 text

public repo local repo local repo public repo git fetch (http) git push (ssh) git fetch (git) git push (ssh) internet A B C A B C A B C D E F A B C D E F D E F

Slide 187

Slide 187 text

public repo local repo local repo public repo git fetch (http) git push (ssh) git fetch (git) git push (ssh) internet A B C A B C A B C D E F A B C D E F D E F D E F

Slide 188

Slide 188 text

multiple remotes

Slide 189

Slide 189 text

developer nick developer jessica my repo 5ec e4a 4a7 ce0 master

Slide 190

Slide 190 text

developer nick developer jessica my repo 5ec e4a 4a7 ce0 master commit

Slide 191

Slide 191 text

developer nick developer jessica my repo 5ec e4a 4a7 ce0 master tree

Slide 192

Slide 192 text

developer nick developer jessica my repo 5ec e4a 4a7 ce0 master blobs

Slide 193

Slide 193 text

schacon/ project developer nick developer jessica "public" my repo 5ec e4a 4a7 ce0 master git push public public/master 5ec e4a 4a7 ce0

Slide 194

Slide 194 text

schacon/ project developer jessica "public" my repo 5ec e4a 4a7 ce0 master git clone (url) public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick

Slide 195

Slide 195 text

schacon/ project developer jessica "public" my repo 5ec e4a 4a7 ce0 master git commit public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f

Slide 196

Slide 196 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f git clone (url) 5ec e4a 4a7 ce0 developer jessica

Slide 197

Slide 197 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git commit

Slide 198

Slide 198 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git push 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09

Slide 199

Slide 199 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" git remote add nick git://github.com/nickh/project.git

Slide 200

Slide 200 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" “nick” git remote add nick git://github.com/nickh/project.git

Slide 201

Slide 201 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git remote add jess git://github.com/jessica/project.git

Slide 202

Slide 202 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git remote add jess git://github.com/jessica/project.git “jess”

Slide 203

Slide 203 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 git fetch nick 5ec c12 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "jess" c12 ec5 24f nick/master git fetch nick

Slide 204

Slide 204 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master

Slide 205

Slide 205 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/m e4a git fetch jess e4a nickh/ project c12 ec5 24f jessic proje "nick" "jess ec5 24f nick/mas 2fb df7 4ea a09 jess/mas c12 schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master

Slide 206

Slide 206 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch jess 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12

Slide 207

Slide 207 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 git merge nick jess

Slide 208

Slide 208 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git push public 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63

Slide 209

Slide 209 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63

Slide 210

Slide 210 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63

Slide 211

Slide 211 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63

Slide 212

Slide 212 text

schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63

Slide 213

Slide 213 text

rebasing

Slide 214

Slide 214 text

C1 C2 local jessica master

Slide 215

Slide 215 text

C1 master C2 C1 C2 local jessica master git clone

Slide 216

Slide 216 text

C1 master C2 C3 C4 C1 C2 C5 C6 local jessica master git commit git commit

Slide 217

Slide 217 text

C1 master C2 C3 C4 C1 C2 local jessica pack master git fetch jess C6 C5

Slide 218

Slide 218 text

C1 jess/master C2 C3 C4 C5 C6 local master

Slide 219

Slide 219 text

C1 jess/master C2 C3 C4 C5 C6 master git merge

Slide 220

Slide 220 text

C1 jess/master C2 C3 C4 C5 C6 git merge C7 master

Slide 221

Slide 221 text

C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C3 C4 C5 C6 master git rebase

Slide 222

Slide 222 text

C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase

Slide 223

Slide 223 text

C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase

Slide 224

Slide 224 text

C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase 1 2

Slide 225

Slide 225 text

C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase 1 2

Slide 226

Slide 226 text

C3' C4' C3 C4 C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase

Slide 227

Slide 227 text

C3' C4' C1 jess/master C2 C3 C4 C5 C6 git merge C7 master C1 jess/master C2 C5 C6 master git rebase

Slide 228

Slide 228 text

the treeish

Slide 229

Slide 229 text

the treeish alternate ways to refer to objects or ranges of objects

Slide 230

Slide 230 text

Treeish • full sha-1 • partial sha-1 • branch or tag name • date spec • ordinal spec • carrot parent • tilde spec • tree pointer • blob spec • ranges

Slide 231

Slide 231 text

Full SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d

Slide 232

Slide 232 text

Partial SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d 6e453f523fa1da50 6e453

Slide 233

Slide 233 text

Branch, Remote or Tag Name v1.0 master origin/testing

Slide 234

Slide 234 text

Date Spec master@{yesterday} master@{1 month ago}

Slide 235

Slide 235 text

Ordinal Spec master@{5} 5th prior value of ‘master’

Slide 236

Slide 236 text

Carrot Parent master^2 2nd parent of ‘master’

Slide 237

Slide 237 text

Tilde Spec master~2 2nd generation grandparent of ‘master’

Slide 238

Slide 238 text

Tree Pointer master^{tree} tree that ‘master’ points to

Slide 239

Slide 239 text

Blob Spec master:/path/to/file blob of that file in ‘master’ commit

Slide 240

Slide 240 text

Ranges ce0e4..e4272 everything between two commits

Slide 241

Slide 241 text

Ranges ce0e4.. everything since a commit

Slide 242

Slide 242 text

examples

Slide 243

Slide 243 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master

Slide 244

Slide 244 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^

Slide 245

Slide 245 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^2

Slide 246

Slide 246 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master~2

Slide 247

Slide 247 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2

Slide 248

Slide 248 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2

Slide 249

Slide 249 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master^^^2 master~2^2

Slide 250

Slide 250 text

ce0e4 master 5ec47 2f45e 4eadf 2fbb3 18cae b3be1 a09c6 df2fa c36ae jess/master master~3..master^

Slide 251

Slide 251 text

local stuff

Slide 252

Slide 252 text

the index

Slide 253

Slide 253 text

Git Directory config file hooks index object database references

Slide 254

Slide 254 text

index

Slide 255

Slide 255 text

index working directory repository index git add git commit

Slide 256

Slide 256 text

index working directory repository index git add git commit

Slide 257

Slide 257 text

index working directory repository index git add git commit

Slide 258

Slide 258 text

what?

Slide 259

Slide 259 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage

Slide 260

Slide 260 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage git checkout

Slide 261

Slide 261 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage

Slide 262

Slide 262 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage

Slide 263

Slide 263 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage

Slide 264

Slide 264 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage

Slide 265

Slide 265 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout 5ec e4a 4a7 ce0 master ec5 24f c12 HEAD git wdir mtime fname Object Directory Working Directory Index project/.git/index project/ project/.git/objects stage

Slide 266

Slide 266 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:30 git checkout

Slide 267

Slide 267 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects e4a 24f e4a 24f file1 file2 1:30 1:30 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 vim file2

Slide 268

Slide 268 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 git status

Slide 269

Slide 269 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 git status

Slide 270

Slide 270 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31 git status

Slide 271

Slide 271 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index e4a 24f stage /file1 /file2 1:30 1:31

Slide 272

Slide 272 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2

Slide 273

Slide 273 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2

Slide 274

Slide 274 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2

Slide 275

Slide 275 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git add file2

Slide 276

Slide 276 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git status

Slide 277

Slide 277 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f e4a 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba git status

Slide 278

Slide 278 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit

Slide 279

Slide 279 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit

Slide 280

Slide 280 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit

Slide 281

Slide 281 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 1ba 24f 1ba 24f file1 file2 1:30 1:31 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:30 1:31 1ba a3e 83d git commit

Slide 282

Slide 282 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:32 1:32 1ba a3e 83d vim file1 file2 git status

Slide 283

Slide 283 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:32 1:32 1ba a3e 83d vim file1 file2 git status

Slide 284

Slide 284 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 24f stage /file1 /file2 1:32 1:32 1ba a3e 83d vim file1 file2 git status

Slide 285

Slide 285 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git add file1

Slide 286

Slide 286 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git add file1

Slide 287

Slide 287 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git add file1

Slide 288

Slide 288 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git status

Slide 289

Slide 289 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git status

Slide 290

Slide 290 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 24f file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b git status

Slide 291

Slide 291 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 91b file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b 1a7 6c5 git commit

Slide 292

Slide 292 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 91b file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b 1a7 6c5 git commit

Slide 293

Slide 293 text

5ec e4a 4a7 ce0 master ec5 24f c12 HEAD Object Directory Working Directory project/ project/.git/objects 6d4 91b 1ba 91b file1 file2 1:32 1:32 git wdir mtime fname Index project/.git/index 1ba 91b stage /file1 /file2 1:32 1:32 1ba a3e 83d 91b 1a7 6c5

Slide 294

Slide 294 text

How Do I Use Git?

Slide 295

Slide 295 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 75% 35 min 12m How Do I Use Git?

Slide 296

Slide 296 text

152 Total Commands

Slide 297

Slide 297 text

43 Porcelain Commands

Slide 298

Slide 298 text

We’ll Cover Half

Slide 299

Slide 299 text

getting git

Slide 300

Slide 300 text

git.or.cz

Slide 301

Slide 301 text

git.or.cz wget make make install

Slide 302

Slide 302 text

yum install git-core apt-get install git-core port install git-core +svn

Slide 303

Slide 303 text

setup

Slide 304

Slide 304 text

git config --global user.name “Scott Chacon” git config --global user.email “[email protected]”

Slide 305

Slide 305 text

No content

Slide 306

Slide 306 text

No content

Slide 307

Slide 307 text

1 Down

Slide 308

Slide 308 text

getting a repo

Slide 309

Slide 309 text

git clone

Slide 310

Slide 310 text

Git Protocols ssh:// http[s]:// git:// file:/// rsync://

Slide 311

Slide 311 text

Git Protocols ssh:// http[s]:// git:// file:/// rsync://

Slide 312

Slide 312 text

Git Protocols ssh:// http[s]:// git:// file:/// rsync:// push

Slide 313

Slide 313 text

Git Protocols ssh:// http[s]:// git:// file:/// rsync:// pull

Slide 314

Slide 314 text

git clone

Slide 315

Slide 315 text

git clone

Slide 316

Slide 316 text

git clone

Slide 317

Slide 317 text

git clone

Slide 318

Slide 318 text

initializing a repo cd myproject git init git add . git commit

Slide 319

Slide 319 text

No content

Slide 320

Slide 320 text

No content

Slide 321

Slide 321 text

No content

Slide 322

Slide 322 text

No content

Slide 323

Slide 323 text

No content

Slide 324

Slide 324 text

No content

Slide 325

Slide 325 text

5 Down

Slide 326

Slide 326 text

normal workflow

Slide 327

Slide 327 text

.gitignore

Slide 328

Slide 328 text

No content

Slide 329

Slide 329 text

No content

Slide 330

Slide 330 text

adding and committing

Slide 331

Slide 331 text

No content

Slide 332

Slide 332 text

No content

Slide 333

Slide 333 text

No content

Slide 334

Slide 334 text

No content

Slide 335

Slide 335 text

No content

Slide 336

Slide 336 text

working directory repository index git add git com

Slide 337

Slide 337 text

No content

Slide 338

Slide 338 text

No content

Slide 339

Slide 339 text

working directory repository index git add git commit

Slide 340

Slide 340 text

git log

Slide 341

Slide 341 text

No content

Slide 342

Slide 342 text

No content

Slide 343

Slide 343 text

No content

Slide 344

Slide 344 text

No content

Slide 345

Slide 345 text

No content

Slide 346

Slide 346 text

No content

Slide 347

Slide 347 text

No content

Slide 348

Slide 348 text

No content

Slide 349

Slide 349 text

git log --pretty

Slide 350

Slide 350 text

No content

Slide 351

Slide 351 text

No content

Slide 352

Slide 352 text

No content

Slide 353

Slide 353 text

No content

Slide 354

Slide 354 text

No content

Slide 355

Slide 355 text

No content

Slide 356

Slide 356 text

6 Down

Slide 357

Slide 357 text

git diff

Slide 358

Slide 358 text

git diff (treeish1) (treeish2)

Slide 359

Slide 359 text

git diff master^ > change.diff

Slide 360

Slide 360 text

git diff master^ > change.diff patch -p1 < change.diff

Slide 361

Slide 361 text

git diff master^ > change.diff patch -p1 < change.diff git apply change.diff or

Slide 362

Slide 362 text

git and patches

Slide 363

Slide 363 text

Single Commit git format-patch origin/master --stdout > story.patch git am < story.patch

Slide 364

Slide 364 text

Multiple Commits $ git format-patch -o patches origin $ git send-email --to [email protected] patches $ git am mbox

Slide 365

Slide 365 text

Multiple Commits $ git format-patch -o patches origin $ git send-email --to [email protected] patches $ git am mbox 1 patch file per commit in this directory

Slide 366

Slide 366 text

example: patching rails

Slide 367

Slide 367 text

Patching Rails git clone git://github.com/rails/rails.git cd rails; (vim/emacs etc) git format-patch origin/master --stdout > story.patch upload story.patch to rails.lighthouseapp.com

Slide 368

Slide 368 text

Applying a Rails Patch download story.patch from rails.lighthouseapp.com git am < story.patch

Slide 369

Slide 369 text

11 Down

Slide 370

Slide 370 text

branch, merge, rebase

Slide 371

Slide 371 text

master develop topic

Slide 372

Slide 372 text

master develop topic

Slide 373

Slide 373 text

master develop topic

Slide 374

Slide 374 text

master develop topic

Slide 375

Slide 375 text

master develop topic

Slide 376

Slide 376 text

master develop topic

Slide 377

Slide 377 text

master develop topic

Slide 378

Slide 378 text

master develop topic “production”

Slide 379

Slide 379 text

master develop topic “production” “trunk”

Slide 380

Slide 380 text

master develop topic “production” “trunk” convention!

Slide 381

Slide 381 text

branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production

Slide 382

Slide 382 text

branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production

Slide 383

Slide 383 text

No content

Slide 384

Slide 384 text

No content

Slide 385

Slide 385 text

No content

Slide 386

Slide 386 text

No content

Slide 387

Slide 387 text

No content

Slide 388

Slide 388 text

No content

Slide 389

Slide 389 text

No content

Slide 390

Slide 390 text

C3 master C0 develop story95 C4 C1 C2 idea

Slide 391

Slide 391 text

branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production

Slide 392

Slide 392 text

No content

Slide 393

Slide 393 text

No content

Slide 394

Slide 394 text

No content

Slide 395

Slide 395 text

C3 master C0 develop story95 C4 C1 C2 idea

Slide 396

Slide 396 text

C3 master C0 develop story95 C4 C1 C2 idea

Slide 397

Slide 397 text

No content

Slide 398

Slide 398 text

No content

Slide 399

Slide 399 text

idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master

Slide 400

Slide 400 text

branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production

Slide 401

Slide 401 text

No content

Slide 402

Slide 402 text

No content

Slide 403

Slide 403 text

No content

Slide 404

Slide 404 text

No content

Slide 405

Slide 405 text

No content

Slide 406

Slide 406 text

idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master

Slide 407

Slide 407 text

branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production

Slide 408

Slide 408 text

No content

Slide 409

Slide 409 text

No content

Slide 410

Slide 410 text

No content

Slide 411

Slide 411 text

No content

Slide 412

Slide 412 text

develop C3 C0 story95 C4 C1 C2 C5 C6 master

Slide 413

Slide 413 text

branching workflow normal development want to try an idea have to do a hotfix merge idea into development push to production

Slide 414

Slide 414 text

No content

Slide 415

Slide 415 text

No content

Slide 416

Slide 416 text

develop C3 C0 story95 C4 C1 C2 C5 C6 C7 master

Slide 417

Slide 417 text

No content

Slide 418

Slide 418 text

No content

Slide 419

Slide 419 text

develop C4 C0 story95 C5 C1 C2 C6' C3 master

Slide 420

Slide 420 text

develop C4 C0 story95 C5 C1 C2 C6' C3 master

Slide 421

Slide 421 text

develop C4 C0 story95 C5 C1 C2 C6' C3 master

Slide 422

Slide 422 text

develop C3 C0 story95 C4 C1 C2 C5 C6 C7 master merge rebase develop C4 C0 story95 C5 C1 C2 C6' C3 master

Slide 423

Slide 423 text

one more time now!

Slide 424

Slide 424 text

C3 master C0 develop story95 C4 C1 C2 idea

Slide 425

Slide 425 text

C3 master C0 develop story95 C4 C1 C2 idea git checkout -b idea

Slide 426

Slide 426 text

idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master git commit

Slide 427

Slide 427 text

idea C3 master C0 develop story95 C4 C1 C2 C5 C6 master git checkout master git commit

Slide 428

Slide 428 text

develop C3 C0 story95 C4 C1 C2 C5 C6 master git checkout idea git merge develop git branch -d idea

Slide 429

Slide 429 text

develop C3 C0 story95 C4 C1 C2 C5 C6 C7 master git checkout master git merge develop

Slide 430

Slide 430 text

17 Down

Slide 431

Slide 431 text

sharing git

Slide 432

Slide 432 text

No content

Slide 433

Slide 433 text

No content

Slide 434

Slide 434 text

No content

Slide 435

Slide 435 text

No content

Slide 436

Slide 436 text

No content

Slide 437

Slide 437 text

No content

Slide 438

Slide 438 text

No content

Slide 439

Slide 439 text

No content

Slide 440

Slide 440 text

No content

Slide 441

Slide 441 text

No content

Slide 442

Slide 442 text

No content

Slide 443

Slide 443 text

No content

Slide 444

Slide 444 text

No content

Slide 445

Slide 445 text

No content

Slide 446

Slide 446 text

No content

Slide 447

Slide 447 text

No content

Slide 448

Slide 448 text

No content

Slide 449

Slide 449 text

git clone git://github.com/schacon/simplegit2.git

Slide 450

Slide 450 text

distributed workflow

Slide 451

Slide 451 text

distributed workflow fetch, pull and push

Slide 452

Slide 452 text

fetch

Slide 453

Slide 453 text

No content

Slide 454

Slide 454 text

No content

Slide 455

Slide 455 text

No content

Slide 456

Slide 456 text

No content

Slide 457

Slide 457 text

No content

Slide 458

Slide 458 text

No content

Slide 459

Slide 459 text

pull

Slide 460

Slide 460 text

pull = fetch + merge

Slide 461

Slide 461 text

push

Slide 462

Slide 462 text

No content

Slide 463

Slide 463 text

No content

Slide 464

Slide 464 text

No content

Slide 465

Slide 465 text

git push

Slide 466

Slide 466 text

No content

Slide 467

Slide 467 text

We Know Em All!

Slide 468

Slide 468 text

review

Slide 469

Slide 469 text

• Local Commands • git config • git init • git add • git commit • git status • git tag • git log

Slide 470

Slide 470 text

• Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase

Slide 471

Slide 471 text

• Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase • Remotey Commands • git remote • git fetch • git pull • git clone • git push

Slide 472

Slide 472 text

• Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase • Remotey Commands • git remote • git fetch • git pull • git clone • git push • Patchy Commands • git diff • git apply • git format-patch • git am

Slide 473

Slide 473 text

• Local Commands • git config • git init • git add • git commit • git status • git tag • git log • Branchy Commands • git checkout • git branch • git merge • git rebase • Remotey Commands • git remote • git fetch • git pull • git clone • git push • Patchy Commands • git diff • git apply • git format-patch • git am

Slide 474

Slide 474 text

popular workflows

Slide 475

Slide 475 text

central repository model

Slide 476

Slide 476 text

developer developer developer shared repository developer developer developer developer developer developer

Slide 477

Slide 477 text

developer shared repository developer developer git clone

Slide 478

Slide 478 text

developer shared repository developer developer git push

Slide 479

Slide 479 text

developer shared repository developer developer git push

Slide 480

Slide 480 text

developer shared repository developer developer

Slide 481

Slide 481 text

developer shared repository developer developer git fetch git merge

Slide 482

Slide 482 text

developer shared repository developer developer git push

Slide 483

Slide 483 text

dictator and lieutenants model

Slide 484

Slide 484 text

developer developer dictator developer lieutenant blessed repository developer lieutenant

Slide 485

Slide 485 text

developer developer dictator developer lieutenant blessed repository developer lieutenant git clone

Slide 486

Slide 486 text

developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch git merge

Slide 487

Slide 487 text

developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch git merge

Slide 488

Slide 488 text

developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch; git merge

Slide 489

Slide 489 text

developer developer dictator developer lieutenant blessed repository developer lieutenant git push

Slide 490

Slide 490 text

developer developer dictator developer lieutenant blessed repository developer lieutenant git fetch

Slide 491

Slide 491 text

integration manager model

Slide 492

Slide 492 text

developer public developer public integration manager blessed repository developer private developer private

Slide 493

Slide 493 text

developer public developer public integration manager blessed repository developer private developer private github.com /schacon/ticgit /yob/ticgit /pope/ticgit

Slide 494

Slide 494 text

developer public developer public integration manager blessed repository developer private developer private github.com /schacon/ticgit /yob/ticgit /pope/ticgit “forks”

Slide 495

Slide 495 text

developer public developer public integration manager blessed repository developer private developer private git push

Slide 496

Slide 496 text

developer public developer public integration manager blessed repository developer private developer private git clone

Slide 497

Slide 497 text

developer public developer public integration manager blessed repository developer private developer private git push

Slide 498

Slide 498 text

developer public developer public integration manager blessed repository developer private developer private git fetch git merge

Slide 499

Slide 499 text

developer public developer public integration manager blessed repository developer private developer private git push

Slide 500

Slide 500 text

developer public developer public integration manager blessed repository developer private developer private git fetch git rebase / merge

Slide 501

Slide 501 text

developer public developer public integration manager blessed repository developer private developer private git push

Slide 502

Slide 502 text

How Do I Deploy with Git?

Slide 503

Slide 503 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 4m How Do I Deploy with Git? 15% 6 min

Slide 504

Slide 504 text

capistrano + git

Slide 505

Slide 505 text

deploy.rb

Slide 506

Slide 506 text

deploy.rb

Slide 507

Slide 507 text

deploy.rb

Slide 508

Slide 508 text

No content

Slide 509

Slide 509 text

No content

Slide 510

Slide 510 text

No content

Slide 511

Slide 511 text

other cap options set :branch, "master" set :git_shallow_clone, 1 set :git_enable_submodules, 1

Slide 512

Slide 512 text

ruby + git

Slide 513

Slide 513 text

ruby + git grit git gem git-ruby

Slide 514

Slide 514 text

ruby + git grit git gem git-ruby

Slide 515

Slide 515 text

No content

Slide 516

Slide 516 text

No content

Slide 517

Slide 517 text

github.com/schacon/ ruby-git

Slide 518

Slide 518 text

Where Can I Learn More?

Slide 519

Slide 519 text

2m Who is Scott? What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m How Do I Deploy with Git? 4m Where Can I Learn More? 2m 75% 35 min 15% 6 min 10% 4 min 2m Where Can I Learn More? 15% 6 min

Slide 520

Slide 520 text

Resources git.or.cz gitcasts.com del.icio.us/popular/git #git / #github on IRC peepcode - git book and screencast [email protected] me. here.

Slide 521

Slide 521 text

thats it!

Slide 522

Slide 522 text

thats it! gitcasts.com/git-talk notes, these slides, etc

Slide 523

Slide 523 text

thats it! gitcasts.com/git-talk notes, these slides, etc git.or.cz gitcasts.com del.icio.us/popular/git #git / #github on IRC peepcode [email protected]