From 18fff1a511edd9b8ed5c1df02833bb15dd045300 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Thu, 24 Jun 2021 07:04:53 -0700 Subject: [PATCH 1/3] moved Chuck from current to past maintainer per conversation with Chuck on slack about maintainers for this lesson --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eb7b2ec..80e938f8 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ - [Silvia di Giorgio](https://twitter.com/digiorgiosilvia ) - [Eric Lopatin](https://github.com/elopatin-uc3) - [Drew Heles](https://github.com/dheles) -- [Chuck McAndrew](https://github.com/dcmcand) Past Maintainers: +- [Chuck McAndrew](https://github.com/dcmcand) - [Eva Seidlmayer](https://github.com/EvaSeidlmayer) - [Thea Atwood](https://github.com/tpatwood) - [Katrin Leinweber](https://github.com/katrinleinweber) From de633d0d122d6b4a67b1e7c85c11ba992210b7fa Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Thu, 24 Jun 2021 07:43:11 -0700 Subject: [PATCH 2/3] Edited the key points for episode 2 to address one part of issue 22 (https://github.com/LibraryCarpentry/lc-git/issues/22) --- _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 bfab6a67..2010f446 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -11,9 +11,9 @@ objectives: - "track changes to files using the git repository" - "query the current status of the git repository" keypoints: -- "Git repositories contain metadata about files under version control" -- "This metadata enables us to track changes to files over time" -- "Git uses a two-stage commit process. Changes to files must first be added to the staging area, then committed to the repository" +- "When you initialize a Git repository in a directory, Git starts tracking the changes you make inside that directory." +- "This tracking creates a history of the way the files have changed over time." +- "Git uses a two-stage commit process. Changes to files must first be added to the staging area, then committed to the Git repository." --- ### Using Git @@ -205,7 +205,7 @@ If we just run `git commit` without the `-m` option, Git will launch nano (or wh so that we can write a longer message. Having made a commit, we now have a permanent record of what was changed, -along with metadata about who made the commit and at what time. +and git has also recorded some additional metadata: who made the commite (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. > ## More on the Staging Area > From bb67758f321438199872caef3d9554abd2e6a746 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Thu, 24 Jun 2021 07:51:36 -0700 Subject: [PATCH 3/3] addressed second part of issue 22 about one of the key points for the episode referring to a 'two-stage commit process' while the two stages were not clearly delineated in the body of the lesson. --- _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 2010f446..44b95079 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -13,7 +13,7 @@ objectives: keypoints: - "When you initialize a Git repository in a directory, Git starts tracking the changes you make inside that directory." - "This tracking creates a history of the way the files have changed over time." -- "Git uses a two-stage commit process. Changes to files must first be added to the staging area, then committed to the Git repository." +- "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." --- ### Using Git @@ -83,9 +83,9 @@ The output tells us that we are on the main branch (more on this later) and that unsaved changes). -### Adding and committing +### Two steps: Adding and committing -We will now create and save our first project file. This is a two-stage process. First, we **add** any files for which +We will now create and save our first project file. This is a two-step process. First, we **add** any files for which we want to save the changes to a staging area, then we **commit** those changes to the repository. This two-stage process gives us fine-grained control over what should and should not be included in a particular commit. @@ -205,7 +205,7 @@ If we just run `git commit` without the `-m` option, Git will launch nano (or wh so that we can write a longer message. Having made a commit, we now have a permanent record of what was changed, -and git has also recorded some additional metadata: who made the commite (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. +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. > ## More on the Staging Area >