From 6276d76576a533367cf7589b7e08cd36c0609f66 Mon Sep 17 00:00:00 2001 From: Alex Ball Date: Mon, 2 Mar 2026 18:37:35 +0000 Subject: [PATCH 1/5] Update system config on MacOS --- episodes/02-getting-started.md | 1 + 1 file changed, 1 insertion(+) diff --git a/episodes/02-getting-started.md b/episodes/02-getting-started.md index 72860604..2194372d 100644 --- a/episodes/02-getting-started.md +++ b/episodes/02-getting-started.md @@ -39,6 +39,7 @@ On MacOS, without any configuration your output might look like this: ```output credential.helper=osxkeychain +init.defaultbranch=main ``` On Windows, without any configuration your output might look like this: From 166307a0059f61ff7862de53187ad634cb73e8d9 Mon Sep 17 00:00:00 2001 From: Alex Ball Date: Mon, 2 Mar 2026 18:39:06 +0000 Subject: [PATCH 2/5] Update system config from Git for Windows 2.53.0 and current instructions --- episodes/02-getting-started.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/episodes/02-getting-started.md b/episodes/02-getting-started.md index 2194372d..7776c055 100644 --- a/episodes/02-getting-started.md +++ b/episodes/02-getting-started.md @@ -42,7 +42,7 @@ credential.helper=osxkeychain init.defaultbranch=main ``` -On Windows, without any configuration your output might look like this: +If you followed our instructions for installing Git for Windows, your output might look like this: ```output diff.astextplain.textconv=astextplain @@ -50,15 +50,15 @@ filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true -http.sslbackend=openssl -http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt +http.sslbackend=schannel core.autocrlf=true core.fscache=true -core.symlinks=false +core.symlinks=true +core.editor=nano.exe pull.rebase=false -credential.helper=manager-core +credential.helper=manager credential.https://dev.azure.com.usehttppath=true -init.defaultbranch=main +init.defaultbranch=master ``` If you have different output, then you may have your Git configured already. If you have not configured Git, we will do that together now. From 03788d2f08901f9d72741791bbaeb865b788cdb4 Mon Sep 17 00:00:00 2001 From: Alex Ball Date: Mon, 2 Mar 2026 18:40:52 +0000 Subject: [PATCH 3/5] Add note about Linux/WSL 2 These comments are known to apply to Ubuntu, other distros may vary. --- episodes/02-getting-started.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/episodes/02-getting-started.md b/episodes/02-getting-started.md index 7776c055..247090a0 100644 --- a/episodes/02-getting-started.md +++ b/episodes/02-getting-started.md @@ -61,6 +61,8 @@ credential.https://dev.azure.com.usehttppath=true init.defaultbranch=master ``` +If you are using Linux or WSL 2 on Windows, you might not see any output at all. + If you have different output, then you may have your Git configured already. If you have not configured Git, we will do that together now. First, we will tell Git our user name and email. From d0e032e87c06b0be50017ff4f5fe761d4a36c5d9 Mon Sep 17 00:00:00 2001 From: Alex Ball Date: Mon, 2 Mar 2026 18:42:06 +0000 Subject: [PATCH 4/5] Reflect editor choice in Git for Windows installation --- episodes/02-getting-started.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/episodes/02-getting-started.md b/episodes/02-getting-started.md index 247090a0..6a931b48 100644 --- a/episodes/02-getting-started.md +++ b/episodes/02-getting-started.md @@ -93,14 +93,19 @@ Let's also set our default text editor. A text editor is necessary with some of ## 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. + +Nano is a good choice because it works on Mac, Windows, and Linux; it runs directly in your shell; and has on-screen reminders of how to use it. +If you followed our instructions for installing Git for Windows, it should already be your default editor. + +Vi and Vim also run directly in the shell and have many powerful features, but are less beginner-friendly. + +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. :::::::::::::::::::::::::::::::::::::::::::::::::: 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` value is `"nano -w"` on Mac, Windows, and Linux, which will run the Nano text editor directly in your shell. - -For example: +However, the simplest `core.editor` value is `"nano -w"`, which will run the Nano text editor directly in your shell. +To select it, type the following into your shell: ```bash $ git config --global core.editor "nano -w" From 9c1705b8b6327bee30fc5d0fa744b945d6fbbf75 Mon Sep 17 00:00:00 2001 From: Alex Ball Date: Mon, 2 Mar 2026 18:44:00 +0000 Subject: [PATCH 5/5] Change emphasis of passage on setting default branch Addresses #164. --- episodes/02-getting-started.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/episodes/02-getting-started.md b/episodes/02-getting-started.md index 6a931b48..d09bbc9c 100644 --- a/episodes/02-getting-started.md +++ b/episodes/02-getting-started.md @@ -111,13 +111,17 @@ To select it, type the following into your shell: $ git config --global core.editor "nano -w" ``` -Lastly, we need to set the name of our default branch to `main.` +Lastly, we need to make sure the name of our default branch is set to `main`, as that is what GitHub uses. To do this, type the following into your shell: -```bash +```bash $ git config --global init.defaultBranch main ``` -The `init.defaultBranch` value configures git to set the default branch to `main` instead of `master`. +::::::::::::::::::::::::::::::::::::::::: callout + +You may already have seen a setting for `init.defaultbranch` when you looked at your configuration earlier, overriding Git's internal default. If your system configuration sets the default branch to `main`, you don't necessarily have to set it again yourself, but doing so protects you from any system-level changes. + +:::::::::::::::::::::::::::::::::::::::::::::::::: ### Creating a repository