📁 Files

README.md

main.py

! ConflictS StagedM ModifiedU Untracked

No files staged. Use git add to stage changes.

📊 Commit Graphcurrent branchmain

✏️ Amend & FixupIntermediate0/5

📖 Concepts

git commit --amendModify the most recent commit: add staged changes, edit the message, or both. Never amend commits that have been pushed to a shared branch.

git commit --fixupCreates a "fixup! <original>" commit that interactive rebase with --autosquash automatically pairs with its target — no manual reordering needed.

AutosquashWhen you run git rebase -i --autosquash <ref>, fixup commits are automatically placed right after the commit they target and marked as "fixup" (the commit is used but its message is discarded).

Check the current state

Run git log --oneline. The last commit is "Add login feature". You just realised it has a typo — pirnt instead of print. We'll fix that with --amend.

● Check the current state

○ Fix the typo, stage, and amend the last commit

○ Create a docs file and commit it

○ Update docs.txt and create a fixup commit

○ View the commit history

Terminal

📘 Starting tutorial: Amend & Fixup

Fix up commits with --amend and --fixup, then clean up with interactive rebase

Step 1: Check the current state