Git’in Jiggy With Git

With your co-host: Will Smith!

Why?

• Linux kernel devs got upset at BitKeeper because it went closed source

• Linus Torvalds (the Linux guy) designed his own distributed source control– Take CVS as an example of what NOT to do– Support a distributed workflow– Strong safeguards against corruption (accidental or malicious)– High performance

• Started development April 3rd, 2005• Was used for Linux kernel 2.6.12 (June 16th)• Version 1.0 came out on December 21, 2005

What’s the Deal?

• Distributed source control system– Each developer has a complete history of the

source, and could easily serve as the “master repository”

• Focused on Branching & Merging• Damn Fast

What a commit looks like

TimestampWed, Nov 9th, 10:37 AM

Message“Checkin’ in teh codez”

Tree Object (file) Reference(s)/dev/codez/Will_Smith.cs

Parent Reference89adf523ad1234Previous commit

Git is a big-ass linked list!

First! Last Commit

How do we keep track of everything!?

First! Last Commit

Develop!

Version 4.2!

REFERENCES!

Staging

Commits, How Do They Work?

First!

Develop

New Commit

Doing it wrong: Branching

ALL TEH FILEZ COPY OF ALL TEH FILEZ

BRANCH!

Doing it Right: Branching!

First!

Develop

New Branch!

Merge!

First! 2

1 3 4

Develop

Feature

Current Position

Merge Commit

All Your Rebase R Belong To Us

First!

Develop

Feature

Current Position

Working With RemotesOrigin

Local

“Clone” “Pull”“Push”

Github.com is AWESOME.