The Eleventh Annual Southern California Linux Expo
February 22-24, 2013
Hilton Los Angeles International Airport

Advanced Git


This half day session on Git by the trainers at GitHub will teach you the ins and outs of Git. Topics will include:

  • Interactive rebasing with both the traditional squash, reword and edit, in addition to the new fixup and autosquash.
  • Understanding the modes of git reset and how it affects, preserves, or destructs the history, index, and working directory.
  • Searching through history with string, combination, and pickaxe approaches.
  • Diffing changes past refactorings.
  • Finding the original author of methods in refactored and relocated code.
  • Administratively shaping history with git filter-branch at milestones or after a Subversion import.
  • Minimizing repetitive merge efforts with rerere.
  • Controlling pull and push behavior with advanced configuration options.
  • Manually editing the refspec and git config files.
  • Pushing to and pulling from multiple destinations.
  • Tag signing, tag merging, and signed tag business scenarios.
  • Adding Git notes and their effective namespace use.
  • Relocating chunks of work with rebase onto
  • Leveraging several other cutting-edge Git 1.8 features.
Los Angeles A
Friday, February 22, 2013 - 10:00 to 13:00