Git: Beyond the Basics

by Matthew McCullough 

Wednesday, 13 June 2012 10:00

Time: 13th of June, 10am-6pm
Cost: 250 EUR + VAT (incl coffee-breaks and lunch)
Location: Sokos Hotel Viru, Tallinn, Conference room Bolero 1

This full day Git workshop takes you beyond the basic edit, add, and commit workflow to deep Git features that benefit developers appreciative of what Git’s flexible DVCS model brings to hard-core software development.

Topics Matthew will cover include:

* Using `git cherry` and its cousin, `git cherry-pick` to harvest and inspect commit-specific merges.
* 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 ilter-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 refspect 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.7.9 features…