Git, an Illustrated Primer

Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com
GIT: An Illustrated Primer

http://mojolive.com/profile/dcousineau

History

BitKeeper No Longer Free To Use
Linux Kernel Requires
Distributed
Performant
SVN and CVS... Not So Much
“CVS is what we should NOT do...”

GIT
thus,

gItting
started

+Linux
$> sudo apt-get install git
$> sudo yum install git
$> echo "Seriously?"

+OSX
http://git-scm.com

+OSX
$> ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go)
$> brew install git
$> say "Win!"

+Windows
http://windows.github.com

+Gitting STarted

+My First Repo

+Stage New Files

+Commit Staging

+staging?
working directory
index
repository

+staging?
working directory
index
repository
“staging”

+staging?
working directory
index
repository
modify

+staging?
working directory
index
repository
git add

+staging?
working directory
index
repository git commit

+Directories

+Modify

+Branch!

+Back to Master

+Merge!

+stashing

+Popping

branching

a b c
MASTER
HEAD

a b c
MASTER
DEVELOP
create new branch
HEAD

a b c
MASTER
DEVELOP
Checkout new branch
HEAD

a b c
MASTER
DEVELOP
commit to develop
d
HEAD

commit to master HEAD
a b c
MASTER
DEVELOP
d
e

a b c
MASTER
DEVELOP
merge Develop
d
e
f

Remote

SVN GIT
d
e
b
a
c
d
e
b
a
c
d d
e
b
a
c

+Create a Project

+Doing as I am told

+did as I was told

+Push Again!

+Fetching & Merging

+Pulling

+Two Authors Two Pushes

+AFtermath

+Aftermath

+forking

+pull requests

+MAke Changes IN A NEW BRANCH

+Push Changes

+See Our New Branch

+Create Pull Request

+Oh Look, Our Pull Request

+Oh Look Our Pull Request

+Oh Look, It’s Merged In!

+Remotes

+Adding Another Remote

+create and sync new branches

+Delete local and remote branches

+Pull From One, Push To Another

GIT FLow

http://nvie.com/posts/a-successful-git-branching-model/

Subversion
and GIT

+et voilà
$> git svn clone -s -r 1000:HEAD https://url/to/repo ./wkngcpy
$> git svn show-ignore > .gitignore

+Workflow
Normal GIT Workflow

+Sync
$> git svn dcommit --dry-run
$> git svn dcommit
$> git svn rebase

+With some caveats
anything that has been dcommit’d
is set in stone! do. not. touch.
git branches well
svn... not so much

+Local Branching
$> git merge --squash branch

git merge --squash localbrn
HEAD
a b
c
MASTER
localbrn
d e

git merge --squash localbrn
HEAD
a b
MASTER
DEC

+Why?
SVN is TERRIBLE at merges
git-svn will do it if you don’t
and when it fails, it does so spectacularly
you’ll just litter your commit history

+tracking svn branches
$> git checkout -t remotes/branchname

+creating remote branches
$> git svn branch -m “Creating new branch” branchname
$> git checkout -t remotes/branchname

+personal opinion
except for release tagging
and a develop branch
don’t bother with remote branching
just stick to local and squashes

use git svn
locally
push for
team
adoption
procure git
server
full clone
push to new
git server

Advanced
Usage

+reset my local changes
$> git checkout -- .
tell git “no more options!”

+Replay Last commit
$> git reset --mixed REF

+Gitting Ready

+Results

+Undo Last commit
$> git reset --hard HEAD^
HEAD^ means commit prior
to HEAD. HEAD^2 is 2
commits prior, etc etc.

+“Oops i forgot to branch”
$> git branch newbranchname
$> git reset --hard SHA
commit immediately before
the intended first commit
of our new branch

+“Oops i forgot to branch”

+“Oops I accidentally the commit message”
$> git rebase --interactive SHA
commit immediately
preceding the commit in
question

+Oops

+Lay of the land

+Making decisions

+Reach 88MPH

+Fun with Paradoxes

+Fruits of our labor

+“Oops I committed the private key”
$> git filter-branch --index-filter
'git rm --cached --ignore-unmatch secret.key'
--prune-empty --tag-name-filter cat -- --all
ಠ_ಠ

+Terrible Mistake

+gone now, here yesterday

+VooDoo Magic

+Cleanup The Mess

+Look Ma, No secret.key!

THANKS.FOR YOUR ATTENTION

+further resources
http://git-scm.com/book
FREE!
Attribution-NonCommercial-ShareAlike 3.0 Unported
https://help.github.com

Git, an Illustrated Primer

Recomendados

Recomendados

Más contenido relacionado

Último

Último (20)

Destacado

Destacado (20)

Git, an Illustrated Primer