Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 05-history.md #1016

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Update 05-history.md #1016

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab0c01d
Update 05-history.md
jrteuton Sep 13, 2024
47b5440
Update to guacamole for merging, fix typos
martinosorb Oct 8, 2024
5813c48
Merge branch 'main' into patch-1
martinosorb Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions episodes/05-history.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,10 @@ Changes not staged for commit:
no changes added to commit (use "git add" and/or "git commit -a")

```
Notice that the changes are currently in the staging area.
Again, we can put things back the way they were by using `git restore`:

Notice that the changes are not currently in the staging area, and have not been committed.
If we wished, we can put things back the way they were at the last commit by using `git restore` to overwrite
the working copy with the last committed version:

```bash
$ git restore guacamole.md
Expand Down
Loading