I made this as both a quick reference and a small Git tutorial.
One thing I wanted to avoid was showing dozens of unrelated Git commands without explaining how they fit together.
So the article starts with an empty directory and uses the same example project throughout the whole thing.
It goes from `git init` and the working directory/staging area model through commits and history, then branches, merges, an intentionally created merge conflict, and finally remotes, fetch, pull and push.
There's a downloadable PDF/PNG version for use as a quick reference, and the complete example repository is on GitHub.
I deliberately didn't include everything Git can do. Rebase, stash, cherry-pick, reflog, bisect, worktrees, submodules, etc. are being covered separately in an advanced version.
Corrections and feedback are very welcome, particularly if there's something you think should be considered fundamental rather than advanced.
Author here.
I made this as both a quick reference and a small Git tutorial.
One thing I wanted to avoid was showing dozens of unrelated Git commands without explaining how they fit together.
So the article starts with an empty directory and uses the same example project throughout the whole thing.
It goes from `git init` and the working directory/staging area model through commits and history, then branches, merges, an intentionally created merge conflict, and finally remotes, fetch, pull and push.
There's a downloadable PDF/PNG version for use as a quick reference, and the complete example repository is on GitHub.
I deliberately didn't include everything Git can do. Rebase, stash, cherry-pick, reflog, bisect, worktrees, submodules, etc. are being covered separately in an advanced version.
Corrections and feedback are very welcome, particularly if there's something you think should be considered fundamental rather than advanced.