I promise in this talk that many sources on the Internet will tell you what to type. Here are some of them.

Concepts

• Think Like a Git
• Reset and Checkout
• Five places for files

Setup

• Some good defaults
• Set your editor

Tools

Any of these can show you the commit graph. * gitk (comes with git) * SourceTree * IntelliJ Java IDE

Workflows

• Git-flow explained by me
• Github’s internal strategy
• A simple git branching model

Reference

• cheat-sheet style command summary
• git log custom formats
• Everything Else

Various useful bits

• Many ways to recover lost commits
• Remember conflict resolution with rerere
• Converting from svn
• How to use interactive rebase
• Line endings - the gory details

Git Happens from Saint Louis JavaScript Meetup on Vimeo.

The question that triggered my investigation of git was, “I wish I had made this commit on a different branch. How do I move it?” The answer is in this post:

Follow me on twitter: @jessitron or read my blog: Abstractivate