From 8320b8dab7e98f094a68b54c50f5d1dca5d22866 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Fri, 17 Sep 2021 14:40:58 -0700 Subject: [PATCH 1/6] updated instructor's notes to point out the problem with old versions of OpenSSH on Windows --- _extras/guide.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_extras/guide.md b/_extras/guide.md index 20f17848..5a394f93 100644 --- a/_extras/guide.md +++ b/_extras/guide.md @@ -6,6 +6,10 @@ title: "Instructors' Guide" ____ # Tips and Tricks +Known problems that learners encounter: + +*Windows*: When using an outdated version of Windows OpenSSH, learners cannot set up the SSH connection to GitHub. SOLUTION: Update OpenSSH version. + ____ ## Making a handout From 0fd6c25be5f69a523c7cc4109b36b3f6e89513fd Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Thu, 23 Sep 2021 08:17:29 -0700 Subject: [PATCH 2/6] added a callout to episode 2 to talk briefly about text editors and preferences --- _episodes/02-getting-started.md | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/_episodes/02-getting-started.md b/_episodes/02-getting-started.md index 14c97529..5c0c4f7c 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -23,10 +23,9 @@ we need to configure a few things. The basic elements of a configuration for Git * your name and email address, * what your preferred text editor is, -* set the name of your default branch (branches are an important component of Git that we will cover later) -* and that you want to use these settings globally (i.e. for every project). +* the name of your default branch (branches are an important component of Git that we will cover later) -First, we will tell Git our user name and email. For this lesson, we will be interacting with [GitHub](https://github.com/) and so we want to use the same email address we used when we set up our GitHub account. If you are concerned about privacy, please review [GitHub’s instructions for keeping your email address private](https://help.github.com/articles/keeping-your-email-address-private/). +First, we will tell Git our user name and email. For this lesson, we will be interacting with [GitHub](https://github.com/), and therefore we want to use the same email address we used when we set up our GitHub account. If you are concerned about privacy, please review [GitHub’s instructions for keeping your email address private](https://help.github.com/articles/keeping-your-email-address-private/). It is possible you may have already set up Git on your computer in the past, so let's start by checking if there are any existing configurations. @@ -84,11 +83,24 @@ git config --list ~~~ user.name=Your Name -user.email=yourname@librarian.la +user.email=yourname@domain.name ~~~ {: .output} -Let's also set our default text editor. A text editor is necessary with some of your Git work and the default from Git is vim, which is a great tool, but not useful if you're not familiar with it. +Let's also set our default text editor. A text editor is necessary with some of your Git work, and the default from Git is vim, which is a text editor that is hard to learn at first. Therefore, we recommend setting a simpler text editor in your Git configuration for this lesson. + +> ## Text editors +> +> There are a lot of text editors to choose from, and a lot of people are enthusiastic about their preferences. +> Vi and Vim are popular editors for users of the BASH shell. If you will be using Git or the Shell with a group of people for a project or for work, asking for recommendations or preferences can help you pick an editor to get started with. If you already have your favorite, then you can set it as your default editor with Git. +> text +> +> ~~~ +> code +> ~~~ +> {: .source} +{: .callout} + Any text editor can be made default by adding the correct file path and command line options (see [GitHub help](https://help.github.com/articles/associating-text-editors-with-git/)). However, the simplest `core.editor` values are `"notepad"` on Windows, `"nano -w"` on Mac, and `"nano -w"` on Linux. From 696ce177612c04c0f85d55108682849124061613 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Thu, 23 Sep 2021 08:21:22 -0700 Subject: [PATCH 3/6] revised callout syntax to correct bad display --- _episodes/02-getting-started.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/_episodes/02-getting-started.md b/_episodes/02-getting-started.md index 5c0c4f7c..b591ef07 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -95,9 +95,6 @@ Let's also set our default text editor. A text editor is necessary with some of > Vi and Vim are popular editors for users of the BASH shell. If you will be using Git or the Shell with a group of people for a project or for work, asking for recommendations or preferences can help you pick an editor to get started with. If you already have your favorite, then you can set it as your default editor with Git. > text > -> ~~~ -> code -> ~~~ > {: .source} {: .callout} From 8e4850368aa79c1a76d7258aa996df340bfacd09 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Thu, 23 Sep 2021 08:22:21 -0700 Subject: [PATCH 4/6] revised typo in callout --- _episodes/02-getting-started.md | 1 - 1 file changed, 1 deletion(-) diff --git a/_episodes/02-getting-started.md b/_episodes/02-getting-started.md index b591ef07..fba7a34d 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -93,7 +93,6 @@ Let's also set our default text editor. A text editor is necessary with some of > > There are a lot of text editors to choose from, and a lot of people are enthusiastic about their preferences. > Vi and Vim are popular editors for users of the BASH shell. If you will be using Git or the Shell with a group of people for a project or for work, asking for recommendations or preferences can help you pick an editor to get started with. If you already have your favorite, then you can set it as your default editor with Git. -> text > > {: .source} {: .callout} From bf1f1e1d41544debad9b9170c8406a71d6532d82 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Wed, 15 Feb 2023 14:10:45 -0800 Subject: [PATCH 5/6] Update _episodes/02-getting-started.md Co-authored-by: Erin Becker --- _episodes/02-getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/02-getting-started.md b/_episodes/02-getting-started.md index efc1d96c..d4412918 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -85,7 +85,7 @@ user.email=yourname@domain.name ~~~ {: .output} -Let's also set our default text editor. A text editor is necessary with some of your Git work, and the default from Git is vim, which is a text editor that is hard to learn at first. Therefore, we recommend setting a simpler text editor in your Git configuration for this lesson. +Let's also set our default text editor. A text editor is necessary with some of your Git work, and the default from Git is Vim, which is a text editor that is hard to learn at first. Therefore, we recommend setting a simpler text editor in your Git configuration for this lesson. > ## Text editors > From 85ee62c8a58dda788fa7d414415811233b2d0ba2 Mon Sep 17 00:00:00 2001 From: Elizabeth McAulay Date: Wed, 15 Feb 2023 14:11:02 -0800 Subject: [PATCH 6/6] Update _episodes/02-getting-started.md Co-authored-by: Erin Becker --- _episodes/02-getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/02-getting-started.md b/_episodes/02-getting-started.md index d4412918..2840c2a4 100644 --- a/_episodes/02-getting-started.md +++ b/_episodes/02-getting-started.md @@ -23,7 +23,7 @@ we need to configure a few things. The basic elements of a configuration for Git * your name and email address, * what your preferred text editor is, -* the name of your default branch (branches are an important component of Git that we will cover later) +* the name of your default branch (branches are an important component of Git that we will cover later). First, we will tell Git our user name and email. For this lesson, we will be interacting with [GitHub](https://github.com/), and therefore we want to use the same email address we used when we set up our GitHub account. If you are concerned about privacy, please review [GitHub’s instructions for keeping your email address private](https://help.github.com/articles/keeping-your-email-address-private/).