03 Take it back with restore

3 / 33

Goal

Commit app.js, and discard your change to config.yml completely.

You ran git add . and staged two files. One of them, config.yml, only has a local tweak you made while debugging — it shouldn't be committed, and you don't need it any more.

git restore moves changes backwards. With --staged it takes a file out of the staging area and leaves your edit in the working directory. Without it, it throws away the working-directory change and puts the file back to how it was in the last commit.

Try it

Unstage config.yml, discard the change, then commit what's left.

git restore <file> without --staged is one of the few commands that really destroys work: an uncommitted change has no history to recover it from.

Go to the terminal

Hint

git restore --staged config.yml unstages it; git restore config.yml then discards the change.

Show a solution

git restore --staged config.yml
git restore config.yml
git commit -m "Add retry to the uploader"

This interactive environment needs JavaScript. Everything you need to read is on this page, and the solution works the same way for real.

Git

Starting Git…