Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions _includes/install_instructions/shell.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ <h3>Installing Git for Windows</h3>
<ol>
{% comment %} Git 2.29.1 Setup {% endcomment %}
<li>
Click on "Next" four times (two times if you've previously
installed Git). You don't need to change anything
Click on "Next" four times (if you see "Install" instead of "Next", uncheck the box "Only show new options", then click "Next" two times). You don't need to change anything
in the Information, location, components, and start menu screens.
</li>
<li>
Expand All @@ -99,7 +98,7 @@ <h3>Installing Git for Windows</h3>
{% comment %} Adjusting the name of the initial branch in new repositories {% endcomment %}
<li>
On the page that says "Adjusting the name of the initial branch in new repositories", ensure that
"Let Git decide" is selected. This will ensure the highest level of compatibility for our lessons.
"Let Git decide" is selected and click on "Next". This will ensure the highest level of compatibility for our lessons.
{% comment %}
This section also has "Override the default branch name for new repositories" and has a text box set
to "main". I'm not having people switch to this just yet because our git lesson still uses the old paradigm.
Expand All @@ -114,7 +113,7 @@ <h3>Installing Git for Windows</h3>
</li>
{% comment %} Choosing the SSH executable {% endcomment %}
<li>
Select "Use bundled OpenSSH".
Select "Use bundled OpenSSH" and click on "Next".
</li>
{% comment %} Choosing HTTPS transport backend {% endcomment %}
<li>
Expand All @@ -134,7 +133,7 @@ <h3>Installing Git for Windows</h3>
</li>
{% comment %} Configuring extra options {% endcomment %}
<li>
Ensure that "Default (fast-forward or merge) is selected and click "Next"
Ensure that "Fast-forward or merge" is selected and click "Next"
</li>
<li>
Ensure that "Git Credential Manager" is selected and click on "Next".
Expand Down