Our Emperor Sponsors

  • InternetNZ
  • Google
  • IBM
  • HP

<-- Back to schedule

Git Wrangling - Advanced Tips and Tricks

Time:15:45 - 16:30
Day:Wednesday 20 January 2010
Location:Ilott Theatre (Town Hall)
Project: Git

Git is the distributed source control system used to manage the source of the Linux kernel, Perl, Gnome, Qt, Ruby on Rails and thousands of other important Open Source projects. Many of us are familiar with the basics of Git and may use it on a daily basis, but there are some interesting gems of functionality hidden in the depths of Git obscurity. This talk will shed some light on these tools for you. We will cover topics like advanced rebasing techniques, pickaxe, subtree merging as a submodule alternative, git attributes, patch and edit based interactive staging, little known configuration settings and more. This presentation is not for the feint of Git-heart, but will mold the journeymen among you into true Git-fu masters.

Scott Chacon

Scott Chacon is a Git evangelist and Ruby developer currently working at He is the author of the Creative Commons licensed book Pro Git ( and the Git Internals Peepcode PDF as well as the maintainer of the Git homepage ( and the Git Community Book ( Scott has presented at RailsConf, RubyConf, Scotland on Rails, Ruby Kaigi, OSCON and a number of local groups and has done corporate training on Git across the country.