Sessions at Strange Loop 2011 about Git

Sunday 18th September 2011

• Git Foundations

  by Matthew J McCullough

  Distributed version control is all the rage these days, but is it worth it? It has been transformative for the dozens of organizations and thousands of developers that I’ve mentored on the unique implementation called Git. But don’t take my word for it. Discover the joy of a version control system that works for you, not against you, in a hands-on workshop. Bring a Windows, Mac, or Linux laptop and we’ll install, set up, use and bend Git into workflows that weren’t even possible with the version control systems of yesteryear. Be prepared to rethink how lightweight, fast, and refreshing source code control can be. After completing this workshop you’ll be able to do practical work with Git for your day job or weekend OSS hobby.

  Highlights of this workshop include:

  • Creating local repositories.
  • Seeing Git as a content tracker (not just file tracker).
  • Understanding Git network operations, including cloning, remotes, pushing & pulling.
  • Branching for experiments, stories, and features.
  • Merging branches, tags, and arbitrary hashes with recursive and fast-forward outcomes.
  • Rebasing for code change clarity, unification, and history linearity.
  • Git

  At 11:30am to 2:30pm, Sunday 18th September

  In Salon A, Hilton St. Louis at the Ballpark

• Git Advanced

  by Matthew J McCullough

  Many Git workshops successfully focus on the basics for those new to DVCS. However, with Git having a full 5 years on the street now, there is a growing desire to address the maturing users of this innovative DVCS. This workshop will take existing Git users and bring them to a heightened level of productivity by leveraging Git’s powerful, yet underused “advanced” features.

  Highlights of this workshop include:

  • Studying team-collaboration techniques with Git.
  • Applying road-tested branching strategies.
  • Cherry picking bug fixes and other nuggets of code in both linear and rebase workflows.
  • Building custom commands via aliases and shell scripts.
  • Undoing and redoing almost anything via revert, reset, reflog and stash.
  • Minimizing repetitive work with rerere, pickaxe, and bisect.
  • Leveraging fixup, autosquash, squash and interactive rebase to fluidly make source history more comprehensible.
  • Git

  At 3:00pm to 6:00pm, Sunday 18th September

  In Salon A, Hilton St. Louis at the Ballpark

Monday 19th September 2011

• A Tale of Three Trees

  by Scott Chacon

  Git is the version control system most of us use every day. However, there are some strangenesses to it. Raise your hand if you really understand the ‘reset’ command. When it comes down to it, this is one of the most interesting, fundamental and amazing commands that Git has, yet nearly everybody is afraid of it. This is just bad marketing. This talk will de-mystify the ‘reset’ command so that you are not only comfortable using it, but can do new and interesting things with it and in doing so will arrive at a better understanding of the entire Git system. We will explore the Three Trees of Git (HEAD, index, work tree) and all the cool and mind-bending fun you can have with them.

  • Git
  • Tools

  At 1:00pm to 1:50pm, Monday 19th September

  In Grand Ballroom, Hilton St. Louis at the Ballpark

  Coverage video