david krmpotic: git

GITgit the basics right

david krmpotić

Saturday, November 28, 2009

What is GIT?

• source control system• distributed• offline


Git is not....


GIT vs SVN


Basics


Basic Commands

• git init• git clone• git add + git commit• git push• git pull• git log


Git log


Everything is local


Staging Area (index)

• an intermediate step• allows flexibility• build commits the way you want


Why is it better than X?

• cheap local branching• everything is local• fast• small space• staging area• any workflow• GitHub

http://whygitisbetterthanx.comSaturday, November 28, 2009

http://whygitisbetterthanx.com

http://whygitisbetterthanx.com

Branching

• git branch develop• git merge develop


FAST


Time to Take The Time!

• if you want to go faster, stop and learn GIT


Source Control Taxonomy


DAG (no deltas)


Source Control Taxonomy


Workflow

svn styleSaturday, November 28, 2009

Integration Manager Workflow


Dictator and Lieutenants Workflow

Linux kernel developmentSaturday, November 28, 2009

Object Database

• blob• tree• commit• (tag)


SHA

• Each object is identified by a SHA-1 hash of its contents


Blob


Tree


Commit


Immutable objects


Repository Internals


Branching commands

• git branch• git checkout• git merge• git rebase


Remotes

= remote branchThey take the form (remote)/(branch). For instance, if you wanted to see what the master branch on your origin remote looked like as of the last time you communicated with it, you would check the origin/master branch.


Tools


Resources

• gitready.com• O’Reilly: Version Control with Git• PeepCode: Git• whygitisbetterthanx.com• gitcasts.com/git-talk• progit.org• [email protected]


mailto:[email protected]

mailto:[email protected]

david krmpotic: git

Education

basics saturday

saturday

git

sha

november 28

time