GIT FOR EVERYONENabeel Ali Memon

1Thursday, July 28, 11

Conceptual Differences

If you’r not distributed, you’r not worth it

If you won’t let me work offline, you’r not worth it

If you give me hard time merging changes, you’r not worth it

If you’r dead slow, you’r not worth it

2Thursday, July 28, 11

Learning Git(Subversion re-education)

What is a repository?

What is a commit?

What are branches?

What is commit-history?

What about merges?

3Thursday, July 28, 11

A typical SVN repository

4Thursday, July 28, 11

A [distributed] Git repo

5Thursday, July 28, 11

A Commit

SVN

Commit: svn commit -m “My cool commit”

Git

Stage: git add <fileName(s)>

Commit: git commit -m “My cool commit”

Push: git push

6Thursday, July 28, 11

A Branch

SVN

svn copy <repo-to-branch> <branch-name>

Git

git branch <branch-name>

7Thursday, July 28, 11

Commit HistorySVN

One-way (revision number increments)

Unchangable

Very Slow

Git

Merges (based on hashcodes)

Changeable, Squashable, Splittable, Reshapable

Extremely Fast

8Thursday, July 28, 11

A Merge (conflict resolution)

SVN

Simple Stupid merge (based on your changes and my changes)

Git

Multi-Strategy, Intelligent merge (octopus, resolve, recursive, subtree, ours)

Rebase (and get rid of dumb merge-commit)

9Thursday, July 28, 11

Where to go

http://gitref.org/

http://progit.org/book/

http://code.google.com/p/gerrit/

10Thursday, July 28, 11