27
1 Distributed Source Control with Git David O’Hara @davidmohara 1

Distributed Source Control with Git

Embed Size (px)

DESCRIPTION

Introduction to git as given at North Dallas .NET User Group May 5, 2010

Citation preview

Page 1: Distributed Source Control with Git

1

Distributed Source Control with Git

David O’Hara@davidmohara

1

Page 2: Distributed Source Control with Git

2

WHO AM I??

2

Page 3: Distributed Source Control with Git

33

SVN 2.0

Page 4: Distributed Source Control with Git

4

DistributedVersionControlSystem

4

Page 5: Distributed Source Control with Git

55

Server

Client

Client

Client

Page 6: Distributed Source Control with Git

66

Client

Client

Client

Client

Page 7: Distributed Source Control with Git

7

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

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

7

Identify Yourself

Page 8: Distributed Source Control with Git

8

Make Life Easier∞Aliases

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

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

∞AutoCRLF

8

Page 9: Distributed Source Control with Git

99

Index RepositoryWorkingDirectory

Page 10: Distributed Source Control with Git

1010

Index RepositoryWorkingDirectory

Init

Page 11: Distributed Source Control with Git

1111

Index RepositoryWorkingDirectory

Clone

Remote

Page 12: Distributed Source Control with Git

1212

Index RepositoryWorkingDirectory

Add• Untracked

• Updated

Page 13: Distributed Source Control with Git

1313

Index RepositoryWorkingDirectory

Commit

Page 14: Distributed Source Control with Git

1414

Index RepositoryWorkingDirectory

Push

Remote

Page 15: Distributed Source Control with Git

15

Fetch

15

Index RepositoryWorkingDirectory

Pull

Remote

Rebase

Page 16: Distributed Source Control with Git

16

Clone(svn)

16

Index RepositoryWorkingDirectory

Subversion

Page 17: Distributed Source Control with Git

17

Fetch(svn)

17

Index RepositoryWorkingDirectory

Subversion

Rebase(svn)

Page 18: Distributed Source Control with Git

1818

Index RepositoryWorkingDirectory

DCommit

Subversion

Page 19: Distributed Source Control with Git

19

SHOW ME SOMETHING

19

Page 20: Distributed Source Control with Git

2020

f28r5 b0934 e48u4 a9473

master

feature

f901e

Page 21: Distributed Source Control with Git

2121

b0934 e48u4 a9473

master

feature

f901ee9836

Page 22: Distributed Source Control with Git

2222

b0934 e48u4 a9473

master

feature

f901ee9836

038de

8372e

038de

Page 23: Distributed Source Control with Git

2323

b0934 e48u4 a9473

master

feature

f901ee9836

038de

feature

Page 24: Distributed Source Control with Git

24

SHOW ME MORE

24

Page 25: Distributed Source Control with Git

25

Questions

25

Page 26: Distributed Source Control with Git

26

GUI Crutches∞gitk & git gui

∞http://gitextensions.sourceforge.net

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

26

Page 27: Distributed Source Control with Git

27

Resources∞http://tinyurl.com/getgit

∞http://progit.org

∞http://github.com

[email protected]

27