Most modern development workflows rely on version control, and most of those use Git. It's easy to follow a quick tutorial and learn a few basic commands--and you should, before listening to this episode--but how much do you know about Git's history, how it compares to other version control systems, or what's actually happening with branches and commits and merges and rebases?

Git enthusiast and expert Gemma Anible joins us this week to teach about some of the foundational basics of Git--not "git commit", but how it's actually architected--and then some common mistakes and pro tips.

Gemma on twitter: https://twitter.com/ellotheth
Gemma on Mastodon: https://mastodon.technology/@ellotheth
Gemma’s web site: https://ramblinations.com/
Gemma on YouTube: Navigate your git repository: https://www.youtube.com/watch?v=QeABW6OU1Gg
WonderProxy: https://wonderproxy.com/
CVS: https://nongnu.org/cvs/
Subversion: https://subversion.apache.org/
Washington, DC legal code: https://github.com/DCCouncil/dc-law-xml
Solo TV show: https://en.wikipedia.org/wiki/Solo_(TV_series)
Felicity Kendal: https://en.wikipedia.org/wiki/Felicity_Kendal
Effervescent: https://www.thefreedictionary.com/effervescent
The Ars Technica article where I read about it: https://arstechnica.com/tech-policy/2018/11/how-i-changed-the-law-with-a-github-pull-request/
TortoiseSVN (https://tortoisesvn.net/) and TortoiseGit (https://tortoisegit.org/), both for Windows
Git fast forwards: https://confluence.atlassian.com/bitbucket/git-fast-forwards-and-branch-management-329977726.html
Image halfway down this blog, “The Git History Is A Graph!“: https://jqassistant.org/shadows-of-the-past-analysis-of-git-repositories/
For what would be in the Git reflog on Github: https://developer.github.com/v3/activity/events/
Git: https://git-scm.com/
Pro Git boo: https://git-scm.com/book/en/v2
Learn Git Branching: https://learngitbranching.js.org/
Matt’s Git Cherry Pick article: https://mattstauffer.com/blog/how-to-merge-only-specific-commits-from-a-pull-request/
Timothy Zahn’s Star Wars trilogy: https://www.goodreads.com/series/42348-star-wars-the-thrawn-trilogy
Mara Jade Skywalker - https://starwars.fandom.com/wiki/Mara_Jade_Skywalker
Ender’s Game - https://en.wikipedia.org/wiki/Ender's_Game

-----

Editing sponsored by Tighten; transcript sponsored by Larajobs.

HAP 07 - Richard Parkinson on Egyptian Poetry