Clarify explanation of staging area #189
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The explanation of the staging area in episode 2 was reproduced from the Software Carpentry Git Novice lesson. The original wording relied on people reading "snapshot" in just the photographic sense, and understanding "the extra" in sense of an archetype ("you know, that guy"). But people may also be familiar with other senses of "snapshot", and I for one thought that an earlier introduction to this extra had been accidentally deleted.
The text has since been clarified in the Software Carpentry lesson. This PR reproduces edits made in swcarpentry/git-novice@e6fe3e6 from PR swcarpentry/git-novice#707 (credit to @vyasr).