JavaZone 2010 - Git-fu!
So you've been using git a little; it's time for git-fu! Learn about git-workflows, commit topologies and how they interact when your project performs its everyday work. Understand merge, rebase, interactive rebase, interactive add, stash, cherry-pick and rerere; do you really need them all? Get the "zen of git", with "real world" use-case centric live demos!
Kristian Rosenvold
Pragmatic programmer, works as a consultant for Zenior AS.
Has introduced git in large corporate norwegian project and held several courses for other corporate git customers.