Effective use of git in the real world

I presented this at Sophos.

Agenda

Strategies, tactics and tips for a cleaner git history in an imperfect world.

Examples use git command line with memorable diagrams.

Your tooling (stash/github/IDE) lies on top of it, principles stay the same.