Quick intro to Git

let’s roll

Really Quick Intro To Git Hasan Veldstra <hasan@hypernumbers.com> hypernumbers

like CVS or SVN, only much better. fundamental difference – distributed. source control system the logo: an artistic impression:

SVN CVS

GIT ⋙ { SVN CVS

roadmap, disclaimers &c why it’s cool, how it works, how to get started right now. basic stuff – if you like what you see, there’s lots of detailed documentation elsewhere. i am not an expert, just sharing bits i’ve learned.

2005, to manage Linux kernel, spread fast.

Linux kernel

Android

Fedora

Ruby On Rails

Git itself

why Git?

why Git? • makes stuff cheap = streamlines things & encourages good practices

why Git? • makes stuff cheap • any workﬂow gets out of your way, doesn’t dictate the way you should work. use it like SVN or use it like the Linux devs.

why Git? • makes stuff cheap • any workﬂow • fast by design & implementation (no network, speed as one of the goals, written in C by great C hackers)

SVN is even slower than Bazaar from http://whygitisbetterthanx.com by Scott Chacon of GitHub

why Git? • makes stuff cheap • any workﬂow • fast • small as small or smaller than an equivalent SVN repo.

why Git? • makes stuff cheap • any workﬂow • fastGit has acquired a reputation for being somewhat difﬁcult to get started with and understand but that’s lies. • small • easy to learn

$ cd (project directory) $ git init $ (create some files) $ git add . $ git commit -m 'start the project'

distributed

distributed = no central repository

distributed = no central repository (superset of SVN &c)

centralized (SVN): repository

centralized (SVN): repository !

centralized (SVN): repository ! ! devs “check out” the code to create a “working copy”

centralized (SVN): repository check in ! !

centralized (SVN): repository check in check out ! !

centralized (SVN): repository check in check out ! ! make changes

centralized (SVN): repository check in check out ! ! make changes check in back to repo

centralized (SVN): repository check in check out ! ! make changes check in back to repo update

centralized (SVN): repository one-to-many relationship

centralized (SVN): repository - - - - - - - - working copy #1

centralized (SVN): repository - - - - - - - - - - - working copy #2 - - - - - working copy #1

centralized (SVN): repository - - - - - - - - working copy #3 - - - - - - - - - - - working copy #2 - - - - - working copy #1

centralized (SVN): • working copies are inferior

centralized (SVN): • working copies are inferior • & can’t talk to each other

centralized (SVN): • working copies are inferior • & can’t talk to each other • you gotta be online

centralized (SVN): • working copies are inferior • & can’t talk to each other • you gotta be online • single point of failure

distributed (Git):

distributed (Git): checkout

distributed (Git): checkout clone we don’t check out, we clone clone = full history, can do anything original can

distributed (Git): “canonical” repository "canonical" because it's a social convention, not a technical requirement

distributed (Git): “canonical” repository ! local repository #1

awesome #1

awesome #1 local commits no network => FAST FAST => less “friction” less “friction” => encourages you to commit more often no network => work ofﬂine big deal actually, i work in Starbucks a lot, actualy the reason i started using Git in the ﬁrst place. also nice to be productive on trains, planes &c. it also allows private work, so you can use your revision control system even for early drafts you don't want to publish

awesome #1 local commits #1 say you’re working on a feature, & you do the work in several stages, over a couple of days maybe you know, you write the first messy and inefficient version first, and then you refactor it, test it &c &c.

awesome #1 local commits #1 #2

awesome #1 local commits with SVN you either commit all intermediate steps to the central repo, which clutters up history... ... or you don’t, in which case you’re left on your own and there is no one there to save your butt WHEN you screw up: you can’t roll back to an earlier state, you can only restore clean from the server, losing work. this of course sucks big time. #1 #2 #3

awesome #1 local commits (& revision before pushing)

distributed (Git): “canonical” repository ! local repository #1

distributed (Git): “canonical” repository ! local repository #1 ! local repository #2

distributed (Git): “canonical” repository clones are full-ﬂedged repositories => exchange patches and merge between them without touching ! the main repo. several people can work together on something new amongst themselves, and then push to main when local repository #1 done. ! = awe local repository #2 some

staging area “canonical” repository like a shelf on which to put things that’ll make up the next commit. incremental building of. “chunk commits” = awesome. “tangled working copy” problem gone. local repository - - - - - - - - working copy - - - object database, trees & - - - blobs that represent the stuff on your disk tracked by the repo repo (ﬁle contents, staging area

as many as you want independent of each other private FAST operations (create, check out, merge, delete) * for new ideas * for bugﬁxes/features * master for production, one for testing, several for day-to-day work changes the way you work can manage to do some of this with other systems, but is PITA. branching

workﬂows

centralized basically like SVN but nicer

integration manager blessed repo, integration manager, many devs. “open-source model”.

dictator & lieutenants for massive projects, like Linux Kernel

inﬁltration a howto start using Git tomorrow without anyone suspecting a thing.

git-svn

$ git svn clone (URL) $ git branch bugfix-branch $ git checkout bugfix-branch (make a bunch of changes) $ git commit -m “fixed this bug” $ git rebase -i git-svn $ git checkout master $ git svn rebase $ git rebase bugfix-branch $ git svn dcommit ...all it takes

Tools • egit for Eclipse • magit for Emacs • plugins for NetBeans & Visual Studio in the works • so is a TortoiseSvn equivalent • also Gitx on OSX, gitk on Linux • gitweb to serve repos over HTTP

Nothing is perfect SVN handles binary ﬁles better SVN allows partial check outs

MOAR: git-scm.com #git on Freenode github.com Trac + Sourceforge + Facebook :]

Questions

Quick intro to Git

by Hasan Veldstra on Nov 12, 2009

Accessibility

Categories

Tags

Upload Details

Usage Rights

1 Embed 3

Statistics

Quick intro to Git — Presentation Transcript