Git Good - An essential guide to git Workshop

This repository contains the content for the Git Good workshop. The workshop is a collection of useful commands, tricks and workflows that I use in my day to day work as a software engineer. Each section is a markdown file in the sections directory. There you will find instructions, examples and commands to run based on a specific git topic.

Prerequisites

You should have git installed on your machine.

Preferably, have a unix/linux/macOS machine. Windows users can use WSL.

Preferably, you should have a GitHub account (I am sure this workshop can work with other git providers as well, but these docs will be biased towards GitHub).

Workshop mindset

• This workshop is a hands-on workshop. You will learn by doing - experiment with commands, be curious, break things, ask questions, repeat.
• It's self-paced - you can spend time on the sections you find interesting or challenging.
• The goal of this workshop is to make you more comfortable with git and to configure new commands that will help you in your day-to-day work. Spend time on setting them to your needs.
• Feel free to contribute to this repository - add new sections, add your feedback, notes, expectations in the testimonials directory.
• This repository is your chance to create PRs, test things and learn how to contribute to open-source projects without the fear of breaking things.

Sections

Each section is a markdown file in the sections directory. There you will find instruction, examples and commands to run based on a specific topic.

• The usual git flow - clone/fork, create a branch, status, commit some changes, git status, git push
• Make yourself at home - git config, git hist, git show, git diff
• Mastering git stash - git stash
• Hot fixing in production - git cherry-pick, git please
• Code review shenanigans - git rebase -i, git commit -sv --amend, git commit -svm
• Who dafaq wrote this - oh it's me - git blame, git bisect
• Context switching between tasks - git stash, git rebase, git merge, git squash
• Advanced settings - ssh key, pre-commit hooks

Contributions

If you find a mistake, or you want to add a section, feel free to open an issue or fork this repository and open a pull request.

References

These references are dedicated to git geeks who want to check more in-depth configs about git. They refer to advanced topics and the guts of git.

• So You Think You Know Git - FOSDEM 2024 https://www.youtube.com/watch?v=aolI_Rz0ZqY - nice tips and tricks from Scott Chacon
• Git's Best And Most Unknown Feature - https://www.youtube.com/watch?v=2uEqYw-N8uE - how to configure and use worktrees.
• You only Git Merge?!? feat Theo : DevHour #1 - https://www.youtube.com/watch?v=7gEbHsHXdn0 - git merge vs git rebase - what's best for big projects
• The guts of git - https://guts-of-git.carson-anderson.com/docs/workshop/ - git internals
• Tutorial on git reflog - https://www.git-tower.com/learn/git/faq/what-is-git-reflog