I wrote a primer on git's least-intuitive and most useful commands (gist.github.com)