Distributed Source Control with Git

1

Distributed Source Control with Git

David O’Hara@davidmohara

1

2

WHO AM I??

2

33

SVN 2.0

4

DistributedVersionControlSystem

4

55

Server

Client

Client

Client

66

Client

Client

Client

Client

7

>> git config --global user.name “[NAME HERE]”

>> git config --global user.email “[EMAIL HERE]”

7

Identify Yourself

8

Make Life Easier∞Aliases

∞http://github.com/davidmohara/configs

∞Colorize∞(Doesn’t work in command - only bash)

∞AutoCRLF

8

99

Index RepositoryWorkingDirectory

1010

Index RepositoryWorkingDirectory

Init

1111

Index RepositoryWorkingDirectory

Clone

Remote

1212

Index RepositoryWorkingDirectory

Add• Untracked

• Updated

1313

Index RepositoryWorkingDirectory

Commit

1414

Index RepositoryWorkingDirectory

Push

Remote

15

Fetch

15

Index RepositoryWorkingDirectory

Pull

Remote

Rebase

16

Clone(svn)

16

Index RepositoryWorkingDirectory

Subversion

17

Fetch(svn)

17

Index RepositoryWorkingDirectory

Subversion

Rebase(svn)

1818

Index RepositoryWorkingDirectory

DCommit

Subversion

19

SHOW ME SOMETHING

19

2020

f28r5 b0934 e48u4 a9473

master

feature

f901e

2121

b0934 e48u4 a9473

master

feature

f901ee9836

2222

b0934 e48u4 a9473

master

feature

f901ee9836

038de

8372e

038de

2323

b0934 e48u4 a9473

master

feature

f901ee9836

038de

feature

24

SHOW ME MORE

24

25

Questions

25

26

GUI Crutches∞gitk & git gui

∞http://gitextensions.sourceforge.net

∞http://code.google.com/p/tortoisegit

26

27

Resources∞http://tinyurl.com/getgit

∞http://progit.org

∞http://github.com

∞[email protected]

27