GIT

Getting Git Scott Chacon

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

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

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

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?

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?

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?

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

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

Who Is Scott? Introducing myself...

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

Scott Anthony Chacon

github.com/schacon

www.gitcasts.com

Rails Git Xen 3D Cameras Huge Flat Screens jepoirrier@ﬂickr

introduce yourself

introduce yourself and your sweet projects...

why is scott here?

What is 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?

git is

directory content management system git is

tree history storage system git is

stupid content tracker git is

a toolkit git is

the “plumbing”

the “porcelain”

not subversion! git is

forget subversion!

not an evolution

svn rcs cvs git not an evolution

source control taxonomy

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

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

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

How Does Git Work?

How Does Git Work? ?

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?

git directory

git directory .git

git directory .git GIT_DIR

Git Directory conﬁg ﬁle hooks index object database references

object database

object database content

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

+ \0 + content content “header”

+ \0 + content sha = Digest::SHA1.hexdigest(new_content) content

+ \0 + content sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...”

+ \0 + content compressed = zlib::deflate(new_content) sha = Digest::SHA1.hexdigest(new_content) content “824aed035c0aa75d64c...”

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

+ \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)}

+ \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

object database git gc

object database git gc same ﬁle with minor differences

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 ﬁle with minor differences

.git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same ﬁle with minor differences

.git/objects/pack/pack-999727..9f600.pack .git/objects/pack/pack-999727..9f600.idx same ﬁle with minor differences “packed” format

object database all git objects are stored this way

+ \0 + content 4 types of git objects

object database blob

object database blob tree

object database commit blob tree

object database commit tag blob tree

object database blob

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

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

git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inﬂate blob : a906cb content zlib::deﬂate

git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inﬂate blob : a906cb content header zlib::deﬂate

git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inﬂate blob : a906cb content header compress zlib::deﬂate

git commands and returns the output. Author : Scott Chacon blob [content size]\0 Zlib::Inﬂate blob : a906cb content header compress object zlib::deﬂate

object database tree

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

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

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

Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inflate filename “inode” info zlib::deflate

Rakefile 040000 tree fe8971 lib tree [content size]\0 tree : 1a738d Zlib::Inﬂate “block pointer” type mode zlib::deﬂate

object database commit

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

object database { Zlib::Inﬂate tree e1b3ec parent a11bef author Scott
Chacon <[email protected]> 1205624433 committer Scott Chacon <[email protected]> 1205624433 my second commit, which is better than the first commit [content size]\0 commit : e1b3ec zlib::deﬂate

blob branch commit remote tree tag object database

object database tag

blob branch HEAD commit remote tree tag object database tag

object database { Zlib::Inﬂate object 0576fa type commit tag v0.1
tagger Scott Chacon <[email protected]> 1205624655 this is my v0.1 tag tag [content size]\0 tag : 0c819c zlib::deﬂate

object database commit tag blob tree immutable

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

references

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

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

blob branch HEAD commit remote tree tag references

the object model

commit tree blob tree tree blob blob branch HEAD

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

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

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

the commit history

blob commit tree C1 } branch branch

branching and merging

C1 master C0 C2 C3 experiment HEAD

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

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

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

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

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

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

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

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

remotes

C1 origin/master C0 C2 master C2 master

C1 origin/master C0 C2 master C1 aster C2 master

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

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

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

tryidea CL3 git merge origin/master origin/idea

tryidea CL3

remote workﬂow

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

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

(ssh) git fetch (git) internet A B C A B C A B C

(ssh) git fetch (git) internet A B C A B C A B C D E F git commit

(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

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

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

multiple remotes

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

master commit

master tree

master blobs

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

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

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

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

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

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

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

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

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

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”

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

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

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

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

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

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

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

rebasing

C1 C2 local jessica master

C1 master C2 C1 C2 local jessica master git clone

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

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

C1 jess/master C2 C3 C4 C5 C6 local master

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

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

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

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

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

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

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

the treeish

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

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

Full SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d

Partial SHA1 6e453f523fa1da50ecb04431101112b3611c6a4d 6e453f523fa1da50 6e453

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

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

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

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

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

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

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

Ranges ce0e4..e4272 everything between two commits

Ranges ce0e4.. everything since a commit

examples

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

c36ae jess/master master^

c36ae jess/master master^2

c36ae jess/master master~2

c36ae jess/master master^^^2 master~2^2

c36ae jess/master master~3..master^

local stuff

the index

index working directory repository index git add git commit

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

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

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

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

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 ﬁle2

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

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

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 ﬁle2

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

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

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 ﬁle1 ﬁle2 git status

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 ﬁle1

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

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

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

How Do I Use 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?

152 Total Commands

43 Porcelain Commands

We’ll Cover Half

getting git

git.or.cz

git.or.cz wget make make install

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

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

1 Down

getting a repo

git clone

Git Protocols ssh:// http[s]:// git:// ﬁle:/// rsync://

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

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

git clone

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

5 Down

normal workﬂow

.gitignore

adding and committing

working directory repository index git add git com

working directory repository index git add git commit

git log

git log --pretty

6 Down

git diff

git diff (treeish1) (treeish2)

git diff master^ > change.diff

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

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

git and patches

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

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

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

example: patching rails

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

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

11 Down

branch, merge, rebase

master develop topic

master develop topic “production”

master develop topic “production” “trunk”

master develop topic “production” “trunk” convention!

branching workﬂow normal development want to try an idea have
to do a hotﬁx merge idea into development push to production

C3 master C0 develop story95 C4 C1 C2 idea

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

C6 master

develop C3 C0 story95 C4 C1 C2 C5 C6 master

develop C3 C0 story95 C4 C1 C2 C5 C6 C7
master

develop C4 C0 story95 C5 C1 C2 C6' C3 master

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

one more time now!

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

C6 master git commit

C6 master git checkout master git commit

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

master git checkout master git merge develop

17 Down

sharing git

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

distributed workﬂow

distributed workﬂow fetch, pull and push

pull = fetch + merge

git push

We Know Em All!

review

• Local Commands • git conﬁg • git init •
git add • git commit • git status • git tag • git log

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

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

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

popular workﬂows

central repository model

developer developer developer shared repository developer developer developer developer developer
developer

developer shared repository developer developer git clone

developer shared repository developer developer git push

developer shared repository developer developer

developer shared repository developer developer git fetch git merge

developer shared repository developer developer git push

dictator and lieutenants model

developer developer dictator developer lieutenant blessed repository developer lieutenant

developer developer dictator developer lieutenant blessed repository developer lieutenant git
clone

fetch git merge

fetch; git merge

push

fetch

integration manager model

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

developer private github.com /schacon/ticgit /yob/ticgit /pope/ticgit

developer private github.com /schacon/ticgit /yob/ticgit /pope/ticgit “forks”

developer private git push

developer private git clone

developer private git fetch git merge

developer private git fetch git rebase / merge

How Do I Deploy with 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

capistrano + git

deploy.rb

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

ruby + git

ruby + git grit git gem git-ruby

github.com/schacon/ ruby-git

Where Can I Learn More?

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

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

thats it!

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

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]

GIT

GIT

Other Decks in Education

Featured

Transcript