World map

 

BM

World 2: Undo Magic

Fix the last commit

You will learn: how to fix the message of your last commit, or add a forgotten file.

The problem

You just made a commit. Then you spot it: “Add day 2 pgae”. Can you fix it?

Watch

git commit --amend swaps your last commit for a fixed one. amend: Replace your last commit with a fixed one. means “fix”. Add -m with the new message.

Try it

Build the command that fixes the typo.

Tap the pieces in the right order.

…

Try it

Now fix the typo for real.

Working folder
  • Empty
Staging area
  • Empty
Repository
  • 4 save points
  • Add day 2 pgae
  • Add style
  • Add day 1 page

Watch

Forgot a file? Put it in the box with git add day2.css. Then run git commit --amend --no-edit. --no-edit keeps the same message.

Predict

You amend a commit. Does it keep the same hash (commit id): A unique code that names one commit, like a1b2c3d.?

Watch

6d3a9b1a8feb63270a76eeb5502c

⚠️ Careful: amend swaps in a new commit. Never amend a commit you already pushed to GitHub. Your team may have the old one.

You did it!

You can now fix your last commit: the message or the files.

Go deeper (optional)

Without -m, git commit --amend opens your editor with the old message. Change it, save and close. Amend only fixes the last commit. Older commits need interactive rebase, in World 3.