From 8537aed399521126051ff2acc1a18d7b2a5d63f9 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 18 Nov 2024 14:32:16 +0000 Subject: [PATCH] differences for PR #1052 --- 05-history.md | 2 +- md5sum.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/05-history.md b/05-history.md index f1fefc8011..69af92c9b4 100644 --- a/05-history.md +++ b/05-history.md @@ -426,8 +426,8 @@ $ cat ketchup.md # this will print the content of ketchup.md on screen The answer is 2. The changes to the file from the second `echo` command are only applied to the working copy, -The command `git add ketchup.md` places the current version of `ketchup.md` into the staging area. not the version in the staging area. +The command `git add ketchup.md` places the current version of `ketchup.md` into the staging area. So, when `git commit -m "My opinions about the red sauce"` is executed, the version of `ketchup.md` committed to the repository is the one from the staging area and diff --git a/md5sum.txt b/md5sum.txt index 21b9c5a61c..d41c377174 100644 --- a/md5sum.txt +++ b/md5sum.txt @@ -7,7 +7,7 @@ "episodes/02-setup.md" "94e00017d43e8b2b539ccc74e544efc9" "site/built/02-setup.md" "2024-11-04" "episodes/03-create.md" "c1198fc3106059d83fd8078d57fbbfef" "site/built/03-create.md" "2024-09-29" "episodes/04-changes.md" "8d0fa100251c01aac31fe3bcb0f4b174" "site/built/04-changes.md" "2024-11-16" -"episodes/05-history.md" "30daba6f377b35ca5e8ad17060c6fee6" "site/built/05-history.md" "2024-11-16" +"episodes/05-history.md" "83ffc023d7cc57579aeb5c6ecacfbd4c" "site/built/05-history.md" "2024-11-18" "episodes/06-ignore.md" "259cee882f99ef27b4187846c74d2716" "site/built/06-ignore.md" "2024-11-04" "episodes/07-github.md" "cc33245b998145b54cfbfc1a647a523d" "site/built/07-github.md" "2024-10-08" "episodes/08-collab.md" "26c15a5971a7caef2daf17c84e72d3c9" "site/built/08-collab.md" "2024-09-29"