From 78028713756390f13676bb3087556ef758a56e4d Mon Sep 17 00:00:00 2001 From: Alex Ball Date: Thu, 28 Aug 2025 12:00:01 +0100 Subject: [PATCH] Clarify explanation of staging area Reproduces edits made in /swcarpentry/git-novice@e6fe3e6 from PR /swcarpentry/git-novice#707. --- episodes/02-getting-started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/episodes/02-getting-started.md b/episodes/02-getting-started.md index 87607b8b..b4f9e225 100644 --- a/episodes/02-getting-started.md +++ b/episodes/02-getting-started.md @@ -297,12 +297,12 @@ and `git commit` then *actually takes* the snapshot, and makes a permanent record of it (as a commit). If you don't have anything staged when you type `git commit`, Git will prompt you to use `git commit -a` or `git commit --all`, -which is kind of like gathering *everyone* for the picture! +which is kind of like gathering *everyone* to take a group photo! However, it's almost always better to explicitly add things to the staging area, because you might -commit changes you forgot you made. (Going back to snapshots, -you might get the extra with incomplete makeup walking on -the stage for the snapshot because you used `-a`!) +commit changes you forgot you made. (Going back to the group photo simile, +you might get an extra with incomplete makeup walking on +the stage for the picture because you used `-a`!) Try to stage things manually, or you might find yourself searching for "git undo commit" more than you would like!