Git a life

GIT A LIFE

@MUKKOO

@mukkoo

VErsioning @mukkoo Version Control System

Copy & Paste VCS @mukkoo project/ project_old/ project_old_old/ project_ok/ project_ok_ok/
project_ok_ok_new/ projectOK_ok_ok_new/

Centralized VCS @mukkoo CVS, Subversion, Perforce Server Repository Client Client
Client Client

Distributed VCS @mukkoo Git, Mercurial, Bazaar Hub Repository Server Server
Server Server Repository Repository Repository Repository

GIT* @mukkoo *idiot

Linus Torvalds

focus @mukkoo 1. Make the opposite of CVS (SVN) 2.
Distributed workﬂow 3. Safe against ﬁle corruption 4. High performance

Snapshot not DIFF @mukkoo 0 +2 +4 -3/2 DIFF: Every
commit record diﬀerences 0 2 6 1,5 SNAPSHOT: Every commit record all ﬁle tree

Three States @mukkoo Git Directory Working Directory Staging Area Untracked
Committed

WARNING!!! the hardest part is coming.

Branching @mukkoo c1 c2 master HEAD feature

Branching @mukkoo c1 c2 master HEAD feature c3 c4 c5
c6 feature2

@mukkoo Need fix on master. NOW!

c6 feature2 c7 c8

c8 c9

The Theory is Over @mukkoo Are you hungry?

Commands @mukkoo

INIT @mukkoo $ git init

status @mukkoo $ git status show the working tree status

ADD @mukkoo $ git add <args> add ﬁle to staging
area

Commit @mukkoo $ git commit -m “message” record changes

LOG @mukkoo $ git log Show commits log

checkout - - @mukkoo $ git checkout -- <file> Restore
a modiﬁed ﬁle

branch @mukkoo $ git branch <branch_name> Create a new branch

checkout @mukkoo $ git checkout <branch_name> Move to branch

merge @mukkoo $ git merge <branch_name> merge branch

DEMO TIME @mukkoo

Useful concepts @mukkoo

remotes (command and concept) fetch (command) push/pull (commands) @mukkoo Network

rebase (command) fast forward (concept) stashing (command) @mukkoo FLOW

ignoring files (.gitignore) gitk and git gui (gui tools) shortcut
and configs (.gitconfig) @mukkoo Settings and tools

Q&A @mukkoo

what does Wordpress use? @mukkoo

GIT A SLICE of pizza @mukkoo

More Decks by Filippo Gangi Dino