Merge pull request #1742 from rgs258/patch-1

Fix #1676: Change master to main

Author: das-g

en/deploy/README.md

@@ -29,9 +29,27 @@ Initialized empty Git repository in ~/djangogirls/.git/
 $ git config --global user.name "Your Name"
 $ git config --global user.email you@example.com
 ```
-
 Initializing the git repository is something we need to do only once per project (and you won't have to re-enter the username and email ever again).
 
+### Adjusting your branch name
+
+If the version of Git that you are using is older than **2.28**, you will need to change the name of your branch to "main". To determine the version of Git, please enter the following command:
+
+{% filename %}command-line{% endfilename %}
+```
+$ git --version
+git version 2.xx...
+```
+
+Only if the second number of the version, shown as "xx" above, is less than 28, will you need to enter the following command to rename your branch. If it is 28 or higher, please continue to "Ignoring files". As in "Initializing", this is something we need to do only once per project, as well as only when your version of Git is less than 2.28:
+
+{% filename %}command-line{% endfilename %}
+```
+$ git branch -M main
+```
+
+### Ignoring files
+
 Git will track changes to all the files and folders in this directory, but there are some files we want it to ignore. We do this by creating a file called `.gitignore` in the base directory. Open up your editor and create a new file with the following contents:
 
 {% filename %}.gitignore{% endfilename %}
@@ -84,7 +102,7 @@ It's a good idea to use a `git status` command before `git add` or whenever you
 {% filename %}command-line{% endfilename %}
 ```
 $ git status
-On branch master
+On branch main
 
 No commits yet
 
@@ -130,12 +148,12 @@ On the next screen, you'll be shown your repo's clone URL, which you will use in
 
 Now we need to hook up the Git repository on your computer to the one up on GitHub.
 
-Type the following into your console (replace `<your-github-username>` with the username you entered when you created your GitHub account, but without the angle-brackets -- the URL should match the clone URL you just saw):
+Type the following into your console (replace `<your-github-username>` with the username you entered when you created your GitHub account, but without the angle-brackets -- the URL should match the clone URL you just saw).
 
 {% filename %}command-line{% endfilename %}
 ```
 $ git remote add origin https://github.com/<your-github-username>/my-first-blog.git
-$ git push -u origin master
+$ git push -u origin main
 ```
 
 When you push to GitHub, you'll be asked for your GitHub username and password (either right there in the command-line window or in a pop-up window), and after entering credentials you should see something like this:
@@ -146,8 +164,8 @@ Counting objects: 6, done.
 Writing objects: 100% (6/6), 200 bytes | 0 bytes/s, done.
 Total 3 (delta 0), reused 0 (delta 0)
 To https://github.com/ola/my-first-blog.git
- * [new branch]      master -> master
-Branch master set up to track remote branch master from origin.
+ * [new branch]      main -> main
+Branch main set up to track remote branch main from origin.
 ```
 
 <!--TODO: maybe do ssh keys installs in install party, and point ppl who dont have it to an extension -->

en/deploy/install_git.md

@@ -7,6 +7,8 @@ data-collapse=true ces-->
 
 You can download Git from [git-scm.com](https://git-scm.com/). You can hit "next" on all steps except for two: in the step where it asks to choose your editor, you should pick Nano, and in the step entitled "Adjusting your PATH environment", choose "Use Git and optional Unix tools from the Windows Command Prompt" (the bottom option). Other than that, the defaults are fine. Checkout Windows-style, commit Unix-style line endings is good.
 
+During installation, if you are presented with the option of "Adjusting the name of the initial branch in new repositories", please choose to "Override the default" and use "main". This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject. 
+
 Do not forget to restart the command prompt or PowerShell after the installation finished successfully.
 <!--endsec-->
 
@@ -15,6 +17,8 @@ data-collapse=true ces-->
 
 Download Git from [git-scm.com](https://git-scm.com/) and follow the instructions.
 
+During installation, if you are presented with the option of "Adjusting the name of the initial branch in new repositories", please choose to "Override the default" and use "main". This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject. 
+
 > **Note** If you are running OS X 10.6, 10.7, or 10.8, you will need to install the version of git from here: [Git installer for OS X Snow Leopard](https://sourceforge.net/projects/git-osx-installer/files/git-2.3.5-intel-universal-snow-leopard.dmg/download)
 
 <!--endsec-->
@@ -27,6 +31,15 @@ data-collapse=true ces-->
 $ sudo apt install git
 ```
 
+### Adjusting your default branch name
+
+This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject. 
+
+{% filename %}command-line{% endfilename %}
+```
+$ git config --global --add init.defaultBranch main
+```
+
 <!--endsec-->
 
 <!--sec data-title="Installing Git: Fedora" data-id="git_install_fedora"
@@ -37,6 +50,15 @@ data-collapse=true ces-->
 $ sudo dnf install git
 ```
 
+### Adjusting your default branch name
+
+This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject. 
+
+{% filename %}command-line{% endfilename %}
+```
+$ git config --global --add init.defaultBranch main
+```
+
 <!--endsec-->
 
 <!--sec data-title="Installing Git: openSUSE" data-id="git_install_openSUSE"
@@ -47,4 +69,13 @@ data-collapse=true ces-->
 $ sudo zypper install git
 ```
 
+### Adjusting your default branch name
+
+This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject. 
+
+{% filename %}command-line{% endfilename %}
+```
+$ git config --global --add init.defaultBranch main
+```
+
 <!--endsec-->