From ab0c01d4e621ac92ca6dc741e690560400504f5c Mon Sep 17 00:00:00 2001 From: jrteuton Date: Fri, 13 Sep 2024 11:35:03 -0700 Subject: [PATCH 1/2] Update 05-history.md The text description did not watch the git respons message, or what was happening. Unless I am confused. I have re-written the descriptive text hopefully correctly and clearly. --- episodes/05-history.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/episodes/05-history.md b/episodes/05-history.md index b4633ef44..249383319 100644 --- a/episodes/05-history.md +++ b/episodes/05-history.md @@ -239,8 +239,8 @@ 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. +So if we wished we can put things back the way they were at the last committ by using `git restore` to overwirte the working copy with the last commited version (from HEAD): ```bash $ git restore mars.txt From 47b5440f92b7ffae3b283df28f21f63df12f1a2b Mon Sep 17 00:00:00 2001 From: Martino Sorbaro Date: Tue, 8 Oct 2024 14:52:39 +0200 Subject: [PATCH 2/2] Update to guacamole for merging, fix typos --- episodes/05-history.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/episodes/05-history.md b/episodes/05-history.md index 249383319..cc9b02a53 100644 --- a/episodes/05-history.md +++ b/episodes/05-history.md @@ -240,11 +240,12 @@ no changes added to commit (use "git add" and/or "git commit -a") ``` Notice that the changes are not currently in the staging area, and have not been committed. -So if we wished we can put things back the way they were at the last committ by using `git restore` to overwirte the working copy with the last commited version (from HEAD): +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 mars.txt -$ cat mars.txt +$ git restore guacamole.md +$ cat guacamole.md ``` ```output