Explicitly guide the renaming of the branch

Author: rgs258

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 %}
@@ -130,7 +148,7 @@ 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). Note that your choice of "main" or "master" in the Installation chapter will determine the final word in the second command.
+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 %}
 ```

en/deploy/install_git.md

@@ -7,7 +7,7 @@ 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.
 
-An option while installing git-scm may be to choose "master" or "main" for your default branch. The use of "master" as the default branch has been deprecated by the global developer community — please see https://github.com/github/renaming for a discussion on the choices. Which option you choose will be important during the later "Deployment" section of this tutorial.
+During installation, if you are presented with the option of "Adjusting the name of the inita branch in new repositories", please choose to "Ovveride 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 throught the remainder of this tutrial. 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-->
@@ -17,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 inita branch in new repositories", please choose to "Ovveride 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 throught the remainder of this tutrial. 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-->
@@ -29,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 throught the remainder of this tutrial. 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"
@@ -39,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 throught the remainder of this tutrial. 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"
@@ -49,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 throught the remainder of this tutrial. 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-->