Sponsors

  • Microsoft
  • Nebula
  • Google
  • SugarCRM
  • Facebook
  • HP
  • Intel
  • Rackspace Hosting
  • WSO2
  • Alfresco
  • BlackBerry
  • CUBRID
  • Dell
  • eBay
  • Heroku
  • InfiniteGraph
  • JBoss
  • LeaseWeb
  • Liferay
  • Media Temple, Inc.
  • OpenShift
  • Oracle
  • Percona
  • Puppet Labs
  • Qualcomm Innovation Center, Inc.
  • Rentrak
  • Silicon Mechanics
  • SoftLayer Technologies, Inc.
  • SourceGear
  • Urban Airship
  • Vertica
  • VMware
  • (mt) Media Temple, Inc.

Sponsorship Opportunities

For information on exhibition and sponsorship opportunities at the convention, contact Sharon Cordesse at scordesse@oreilly.com

Download the OSCON Sponsor/Exhibitor Prospectus

Contact Us

View a complete list of OSCON contacts

Git for Ages 4 and Up

Michael Schwern (eval Empire), Ricardo Signes (Pobox.com)
Tools and Techniques
Location: Portland 256
Tags: git
Average rating: ***..
(3.93, 14 ratings)

Tinker Toys are the best illustration of a Git repository I’ve found. Side-by-side with issuing Git commands, we’ll build a Git repository out of kid’s toys to show what’s going on behind the scenes. Mind bending concepts like remote branches, rebase and the staging area become child’s play.

Basic knowledge of git commands is expected of the audience. If you’ve started using git, but are uncomfortable with it and don’t really get it, this is for you.

WARNING: CHOKING HAZARD – Small Parts. Not For Children Under 4 Years.

Photo of Michael Schwern

Michael Schwern

eval Empire

As a speaker at OSCON I believe we should all strive to create a fun, educational, enjoyable and harassment-free conference experience for everyone.

I’m pleased to say Tim O’Reilly thinks so too!

If you are being harassed, or witness harassment please report it to venue security, the police, the conference organisers or a trusted friend. You do not have to put up with it.

For more detail on what a code of conduct which includes an anti-harassment policy should contain, please review the geekfeminism wiki conference anti-harassment policy template

Schwern has a copy of Perl 6, he lets Larry Wall borrow it and take notes.

Schwern once sneezed into a microphone and the text-to-speech conversion was a regex that turns crap into gold.

Damian Conway and Schwern once had an arm wrestling contest. The superposition still hasn’t collapsed.

Schwern was the keynote speaker at the first YAPC::Mars.

When Schwern runs a smoke test, the fire department is notified.

Dan Brown analyzed a JAPH Schwern wrote and discovered it contained the Bible.

Schwern writes Perl code that writes Makefiles that write shell scripts on VMS.

Schwern does not push to master, master pushes to Schwern.

SETI broadcast some of Schwern’s Perl code into space. 8 years later they got a reply thanking them for the improved hyper drive plans.

Schwern once accidentally typed “git pull —hard” and dragged Github’s server room 10 miles.

There are no free namespaces on CPAN, there are just modules Schwern has not written yet.

Schwern’s tears are said to cure cancer, unfortunately his Perl code gives it right back.

Photo of Ricardo Signes

Ricardo Signes

Pobox.com

Ricardo Signes was thrust into the job market with only a rudimentary humanities education, and was forced to learn to fend for himself. He is now a full-time Perl programmer, project lead on perl itself, and frequent contributor to the CPAN.

Comments on this page are now closed.

Comments

Picture of Ricardo Signes
Ricardo Signes
08/01/2011 7:21am PDT

Schwern and I discussed ways to use a camera to get a projection of the tinker toys on screen, but the fates were against us. When we do this talk again, if the audience is likely to be more than a few rows, we will make sure that we can get a jumbotronic display showing what’s going on.

Picture of Michael Schwern
Michael Schwern
07/29/2011 5:57pm PDT

Sorry that the Tinker Toys didn’t scale too well for such a large audience.

Picture of Michael Schwern
Michael Schwern
07/29/2011 1:24pm PDT

I mentioned that there are some good GUIs for visualizing the repository in a similar way to the Tinker Toys. gitk is the tool that comes with git and it’s pretty good. For the Mac I really like GitX, specifically the Laullon fork which has a lot of improvements. gitx.laullon.com

Picture of Ricardo Signes
Ricardo Signes
07/29/2011 1:10pm PDT

Other people asked for the video of Schwern (without his lovely assistant) performing this talk. It’s here: blip.tv/open-source-develop...

Picture of Ricardo Signes
Ricardo Signes
07/29/2011 1:07pm PDT

A few people asked for the “git hist” alias I was using. Mostly it’s like “git log—oneline—decorate—all—graph” but you can get it, along with most of my git config here:

gist.github.com/1114617