Wednesday Workshops: Let's Git Going

About

Each workshop is ~45 minutes over lunch on Wednesdays. There will be a repo with sample code and additional resources so you can continue learning outside the workshop if you want to.

Curriculum

Git is hard! It doesn't have to be. We'll be loosely following the progression of content in Pro Git. We'll deviate a bit to cover common use cases at Condé, as well as to include topics like GitHub and Git workflow.

Gitting Started

Why version control and why Git? (10 min)
Git primitives (15 min)
The Git command line (10 min)
Git configuration (10 min)

Doing Things

git init (10 min)
git clone (5 min)
git add + options (15 min)
git commit + options (15 min)

Undoing Things

Unstaging commits (10 min)
git revert (10 min)
git reset + options (10 min)
Things got real: git reflog (15 min)

Branching

Basic branching (10 min)
Tracking remote branches (10 min)
git merge and resolving conflicts (15 min)
"Can you just": git cherry-pick (10 min)

Changing History

Rebasing your feature branch onto master/develop (15 min)
Squashing commits with git rebase -i (15 min)
Things got really, really real: git reflog, redux (15 min)

The Git Flow Way of Life

Why Git flow? (10 min)
Git flow overview (20 min)
Practicing Git flow on a test repo (15 min)

Git Management (Anti)Patterns

git tag (10 min)
git stash, pop, and apply (15 min)
Git submodules (10 min)
Git subtrees (10 min)

Bacon-Saving Git Commands, Part I

git bisect (15 min)
Advanced merging and git rerere (15 min)
git grep (15 min)

Bacon-Saving Git Commands, Part II

git diff (15 min)
git log (including --graph) (15 min)
git prune (including remote branches + tags) (15 min)

Git + GitHub

Git vs. GitHub (5 min)
Managing GitHub workflows (20 min)
Advanced GitHub configuration (20 min)

ericqweinstein/git.md