Cheatsheet

Your Git command sheet

Every level you complete unlocks its section.

Show everything (spoilers)

01 · First Repository

git init: git init creates the hidden .git folder with all version metadata. Without it, Git can't track your files.
git add .: The staging area is a preparation zone. It's where you decide exactly which changes go into the next commit.
git commit -m "feat: initial structure": A commit saves a snapshot of the staging area. Describe what you did in the message, e.g. feat, fix or chore + a short description.
git commit -m "<your message>": Create a snapshot of the staging area.

Complete level 1 to unlock

02 · Inspection and History

git status: Shows modified, staged and untracked files so you never commit blindly. It's the first recommended check before add or commit.
git add . && git commit -m "feat: update app": First you pick changes with add, then save them with commit. Run them separately or chain them with && if you already know what you're committing.
git log --oneline: Lets you audit the history and confirm your commit was recorded. With --oneline you quickly see the short hash and message.
git add .: Move the changes to staging.
git commit -m "<your message>": Save the staged changes.

Complete level 2 to unlock

03 · Feature Branches

Complete level 3 to unlock

04 · Merging Branches

Complete level 4 to unlock

05 · Tactical Cherry-pick

Complete level 5 to unlock

06 · Back to a Previous Commit

Complete level 6 to unlock

07 · Configure origin

Complete level 7 to unlock

08 · Emergency Save

Complete level 8 to unlock

09 · Shared Submodule

git submodule add https://github.com/gitjunior/ui-kit.git vendor/ui-kit: git submodule add links another repository inside the current project and records the reference in .gitmodules.
git submodule update --init --recursive: git submodule update --init --recursive downloads the content and leaves the module at the right commit.
git submodule status: git submodule status confirms the submodule is linked and ready to work with.

Complete level 9 to unlock

10 · Undo Without Rewriting

Complete level 10 to unlock

11 · Tagging the Release

Complete level 11 to unlock

12 · Syncing With the Team

git fetch origin: git fetch origin downloads the remote changes but doesn't apply them to your branch. Ideal to see what's there before acting.
git pull origin main: git pull origin main downloads and integrates the remote commits into your current branch. It's equivalent to fetch + merge.
git log HEAD..origin/main --oneline: After fetch you can compare your branch with the remote one using git log HEAD..origin/main to decide whether it's safe to integrate.

Complete level 12 to unlock

13 · Modern Git: switch and restore

Complete level 13 to unlock

14 · Keep Secrets Out of the Repo

git diff: git diff shows line by line what you changed and haven't staged yet. With --staged you see what you already prepared.
echo ".env" > .gitignore: Each .gitignore line is a pattern. Matching files disappear from git status and git add . skips them.
git commit -m "chore: ignore env files": The .gitignore is just another file in the repo: commit it so the whole team inherits the protection.
git add .: Now that .env is ignored, staging everything is safe.
git commit -m "<your message>": All that's left is saving the snapshot.

Complete level 14 to unlock

15 · The Commit That Got Away

Complete level 15 to unlock

16 · Pricing Conflict

git merge feature/pricing: git merge stops and git status lists the files under 'Unmerged paths'. cat shows you the markers.
git add src/pricing.ts: After editing the file (in the simulator we assume you already picked the version), git add tells Git the conflict is resolved.
git commit -m "merge: resolve pricing conflict": A git commit creates the merge commit with two parents. If you change your mind before that, git merge --abort rolls everything back.
git status: Before touching anything, understand which files are in conflict.

Complete level 16 to unlock

17 · Straight-Line History

Complete level 17 to unlock

18 · Lost Commits

Complete level 18 to unlock

19 · Bug Hunt

git bisect start: git bisect start, then mark the current commit as bad and an old known commit as good.
git bisect good: Git leaves you on an intermediate commit. In this challenge, the bug exists in any commit that includes 'cache v2' or comes after it. If the commit is earlier: good. If it's that one or later: bad.
git bisect reset: When Git announces 'is the first bad commit', git bisect reset takes you back to your branch.
git bisect bad: The current commit has the bug.
git bisect good a0a1a2a: Now tell Git which commit worked.

Complete level 19 to unlock

20 · Day One: Clone and Sign

git clone https://github.com/gitjunior/tienda.git: git clone <url> downloads the full history, creates the folder and sets up the origin remote pointing at that URL.
git config user.name "Your Name": git config user.name and user.email define the author of your commits. With --global they apply to all your repositories.
git config --list: git config --list shows every active value. Handy to confirm you aren't signing with the wrong email.
git config user.name "<your name>": Git needs to know which name to sign your commits with.
git config user.email "<your email>": The other half of your identity is missing.

Complete level 20 to unlock

21 · Rename and Delete Without Losing Track

git mv readme.txt README.md: git mv <source> <target> renames the file and stages the change. git status shows it as renamed, not as a deletion plus a new file.
git rm notas-viejas.txt: git rm <file> removes it from disk and stages the deletion, ready for the commit.
git rm --cached config.local.json: git rm --cached <file> takes it out of the repository but keeps it on your disk. It's the way out when you committed something that belonged in .gitignore.
git commit -m "<your message>": All three changes are already staged.

Complete level 21 to unlock

22 · There and Back With a Dash

git switch -: git switch - (or git checkout -) returns you to the branch you came from. Repeating it toggles between the last two.
git merge -: The dash works in merge too: git merge - brings in the branch you just left, without typing its name.
git reflog: The dash is shorthand for @{-1}. Git resolves it by reading the 'checkout: moving from X to Y' lines of the reflog.
git switch main: You're asked to check something on the main branch.
git commit -am "<your message>": login.js is still modified: finish the work before merging.

Complete level 22 to unlock

23 · Spring Cleaning

git clean -n: git clean -n lists what it would delete, touching nothing. git clean -f really deletes it. Files removed this way can't be recovered with Git.
git branch -m feature/login: git branch -m <new> renames the current branch. With two names (old and new) it renames any other one.
git remote set-url origin https://github.com/equipo/tienda.git: git remote set-url <remote> <url> updates where fetch and push point. Your commits and branches don't change.
git clean -f: The list is right: only temp files.
git remote -v: Confirm the change was applied.

Complete level 23 to unlock

24 · Repository Detective

git grep calcularTotal: git grep <text> searches the files Git tracks and ignores everything else. With -n it adds the line number.
git shortlog -sn: git shortlog -sn summarizes history by author: how many commits each one has, from most to fewest.
git describe: git describe names the current commit from the nearest tag: v2.1.0-2-gabc1234 means 2 commits after v2.1.0.
git rev-parse --short HEAD: git rev-parse turns any reference into its hash. With --short it returns the abbreviated form, the one you paste in a ticket.

Complete level 24 to unlock