Skip to content

Commit c7810ac

Browse files
authored
Merge pull request #104 from emcaulay/gh-pages
Updated List of Current and Past Maintainers
2 parents 62c3f8c + 7e21824 commit c7810ac

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
- [Silvia di Giorgio](https://twitter.com/digiorgiosilvia )
66
- [Eric Lopatin](https://github.com/elopatin-uc3)
77
- [Drew Heles](https://github.com/dheles)
8-
- [Chuck McAndrew](https://github.com/dcmcand)
98

109
Past Maintainers:
1110

11+
- [Chuck McAndrew](https://github.com/dcmcand)
1212
- [Eva Seidlmayer](https://github.com/EvaSeidlmayer)
1313
- [Thea Atwood](https://github.com/tpatwood)
1414
- [Katrin Leinweber](https://github.com/katrinleinweber)

episodes/02-getting-started.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ objectives:
1111
- "track changes to files using the git repository"
1212
- "query the current status of the git repository"
1313
keypoints:
14-
- "Git repositories contain metadata about files under version control"
15-
- "This metadata enables us to track changes to files over time"
16-
- "Git uses a two-stage commit process. Changes to files must first be added to the staging area, then committed to the repository"
14+
- "When you initialize a Git repository in a directory, Git starts tracking the changes you make inside that directory."
15+
- "This tracking creates a history of the way the files have changed over time."
16+
- "Git uses a two-step process to record changes to your files. Changes to files must first be added to the staging area, then committed to the Git repository."
1717
---
1818

1919
### Using Git
@@ -83,9 +83,9 @@ The output tells us that we are on the main branch (more on this later) and that
8383
unsaved changes).
8484

8585

86-
### Adding and committing
86+
### Two steps: Adding and committing
8787

88-
We will now create and save our first project file. This is a two-stage process. First, we **add** any files for which
88+
We will now create and save our first project file. This is a two-step process. First, we **add** any files for which
8989
we want to save the changes to a staging area, then we **commit** those changes to the repository. This two-stage
9090
process gives us fine-grained control over what should and should not be included in a particular commit.
9191

@@ -205,7 +205,7 @@ If we just run `git commit` without the `-m` option, Git will launch nano (or wh
205205
so that we can write a longer message.
206206

207207
Having made a commit, we now have a permanent record of what was changed,
208-
along with metadata about who made the commit and at what time.
208+
and git has also recorded some additional metadata: who made the commit (you!) and when the commit was made (timestamp). You are building a mini-history of your process of working with the files in this directory.
209209

210210
> ## More on the Staging Area
211211
>

0 commit comments

Comments
 (0)