https://github.com/andreia-oca/git_good_workshop
Git Good - a workshop for day to day git knowledge
https://github.com/andreia-oca/git_good_workshop
git omniopencon version-control workshop
Last synced: 5 months ago
JSON representation
Git Good - a workshop for day to day git knowledge
- Host: GitHub
- URL: https://github.com/andreia-oca/git_good_workshop
- Owner: andreia-oca
- License: mit
- Created: 2024-09-25T15:04:45.000Z (almost 2 years ago)
- Default Branch: main
- Last Pushed: 2025-11-25T14:26:45.000Z (7 months ago)
- Last Synced: 2025-11-28T20:10:46.651Z (7 months ago)
- Topics: git, omniopencon, version-control, workshop
- Homepage:
- Size: 135 KB
- Stars: 2
- Watchers: 1
- Forks: 18
- Open Issues: 3
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# 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](sections/01-the-usual-git-flow.md) - clone/fork, create a branch, status, commit some changes, git status, git push
- [Make yourself at home](sections/02-make-yourself-at-home.md) - git config, git hist, git show, git diff
- [Mastering git stash](sections/03-mastering-git-stash.md) - git stash
- [Hot fixing in production](sections/04-hot-fixing-in-production.md) - git cherry-pick, git please
- [Code review shenanigans](sections/05-code-review-shenanigans.md) - git rebase -i, git commit -sv --amend, git commit -svm
- [Who dafaq wrote this - oh it's me](sections/06-who-dafaq-wrote-this-oh-its-me.md) - git blame, git bisect
- [Context switching between tasks](sections/07-context-switching-between-tasks.md) - git stash, git rebase, git merge, git squash
- [Advanced settings](sections/08-advanced-settings.md) - ssh key, pre-commit hooks
## Contributions
If you find a mistake, or you want to add a section, feel free to open an [issue](https://github.com/andreia-oca/git_good_workshop/issues) or fork this repository and open a [pull request](https://github.com/andreia-oca/git_good_workshop/fork).
## 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
- Great interactive Git tutorial - https://learngitbranching.js.org/