Slide 1

Slide 1 text

GIT A LIFE

Slide 2

Slide 2 text

@MUKKOO

Slide 3

Slide 3 text

@mukkoo

Slide 4

Slide 4 text

@mukkoo

Slide 5

Slide 5 text

@mukkoo

Slide 6

Slide 6 text

VErsioning @mukkoo Version Control System

Slide 7

Slide 7 text

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

Slide 8

Slide 8 text

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

Slide 9

Slide 9 text

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

Slide 10

Slide 10 text

GIT* @mukkoo *idiot

Slide 11

Slide 11 text

Linus Torvalds

Slide 12

Slide 12 text

focus @mukkoo 1. Make the opposite of CVS (SVN) 2. Distributed workflow 3. Safe against file corruption 4. High performance

Slide 13

Slide 13 text

Snapshot not DIFF @mukkoo 0 +2 +4 -3/2 DIFF: Every commit record differences 0 2 6 1,5 SNAPSHOT: Every commit record all file tree

Slide 14

Slide 14 text

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

Slide 15

Slide 15 text

WARNING!!! the hardest part is coming.

Slide 16

Slide 16 text

Branching @mukkoo c1 c2 master HEAD feature

Slide 17

Slide 17 text

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

Slide 18

Slide 18 text

@mukkoo Need fix on master. NOW!

Slide 19

Slide 19 text

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

Slide 20

Slide 20 text

Branching @mukkoo c1 c2 master HEAD feature c3 c4 c7 c8 c9

Slide 21

Slide 21 text

The Theory is Over @mukkoo Are you hungry?

Slide 22

Slide 22 text

Commands @mukkoo

Slide 23

Slide 23 text

INIT @mukkoo $ git init

Slide 24

Slide 24 text

status @mukkoo $ git status show the working tree status

Slide 25

Slide 25 text

ADD @mukkoo $ git add add file to staging area

Slide 26

Slide 26 text

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

Slide 27

Slide 27 text

LOG @mukkoo $ git log Show commits log

Slide 28

Slide 28 text

checkout - - @mukkoo $ git checkout -- Restore a modified file

Slide 29

Slide 29 text

branch @mukkoo $ git branch Create a new branch

Slide 30

Slide 30 text

checkout @mukkoo $ git checkout Move to branch

Slide 31

Slide 31 text

merge @mukkoo $ git merge merge branch

Slide 32

Slide 32 text

DEMO TIME @mukkoo

Slide 33

Slide 33 text

Useful concepts @mukkoo

Slide 34

Slide 34 text

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

Slide 35

Slide 35 text

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

Slide 36

Slide 36 text

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

Slide 37

Slide 37 text

Q&A @mukkoo

Slide 38

Slide 38 text

what does Wordpress use? @mukkoo

Slide 39

Slide 39 text

GIT A SLICE of pizza @mukkoo