Merge pull request #1596 from git/master-to-main

switch "master" branch to "main" within the repo

Author: peff

ARCHITECTURE.md

@@ -61,7 +61,7 @@ know there's a new Git release out, then:
 
 will get it on the site without waiting for the nightly run.
 
-Merges to the `master` branch on GitHub auto-deploy to Heroku, so unless
+Merges to the `main` branch on GitHub auto-deploy to Heroku, so unless
 you're doing something tricky you generally shouldn't need to manually
 deploy.
 
@@ -143,7 +143,7 @@ to the former.
 
 The site mostly just runs without intervention:
 
-  - code merged to `master` is auto-deployed
+  - code merged to `main` is auto-deployed
 
   - new git versions are detected daily and manpages and download links
     updated

README.md

@@ -1,4 +1,4 @@
-# Git Homepage [![Build Status](https://travis-ci.org/git/git-scm.com.svg?branch=master)](https://travis-ci.org/git/git-scm.com) [![Help Contribute to Open Source](https://www.codetriage.com/git/git-scm.com/badges/users.svg)](https://www.codetriage.com/git/git-scm.com)
+# Git Homepage [![Build # Status](https://travis-ci.org/git/git-scm.com.svg?branch=main)](https://travis-ci.org/git/git-scm.com) [![Help Contribute to Open Source](https://www.codetriage.com/git/git-scm.com/badges/users.svg)](https://www.codetriage.com/git/git-scm.com)
 
 This is the web application for the [git-scm.com](https://git-scm.com) site.  It is meant to be the
 first place a person new to Git will land and download or learn about the
@@ -94,7 +94,7 @@ be accepted. If it involves code, please also write tests for it.
 
 The [list of GUI clients](https://git-scm.com/downloads/guis) has been constructed by the community for a long time. If you want to add another tool you'll need to follow a few steps:
 
-1. Add the GUI client details at the YAML file: https://github.com/git/git-scm.com/blob/master/resources/guis.yml
+1. Add the GUI client details at the YAML file: https://github.com/git/git-scm.com/blob/main/resources/guis.yml
     1. The fields `name`, `url`, `price`, `license` should be very straightforward to fill.
     2. The field `image_tag` corresponds to the filename of the image of the tool (without path, just the filename).
     3. `platforms` is a list of at least 1 platform in which the tool is supported. The possibilities are: `Windows`, `Mac`, `Linux`, `Android`, and `iOS`

app/views/downloads/guis/index.html.erb

@@ -12,7 +12,7 @@
     Git comes with built-in GUI tools for committing (<a href="/docs/git-gui">git-gui</a>) and browsing (<a href="/docs/gitk">gitk</a>), but there are several third-party tools for users looking for platform-specific experience.
   </p>
   <p>
-    <small>If you want to add another GUI tool to this list, just <a href="https://github.com/git/git-scm.com/blob/master/README.md#adding-new-gui">follow the instructions</a>.</small>
+    <small>If you want to add another GUI tool to this list, just <a href="https://github.com/git/git-scm.com/blob/main/README.md#adding-new-gui">follow the instructions</a>.</small>
   </p>
 
   <p>

app/views/site/about.html.erb

@@ -17,7 +17,7 @@
     repository at GitHub. That includes all pages except the book and
     manpages, along with the general design of the site. This content
     is available under the
-    <a href="https://github.com/git/git-scm.com/blob/master/MIT-LICENSE.txt">MIT license</a>.
+    <a href="https://github.com/git/git-scm.com/blob/main/MIT-LICENSE.txt">MIT license</a>.
     Bug reports and suggestions may be made in that repository.
 
     <li>Content from the ProGit book is imported from the
@@ -70,6 +70,6 @@
   </ul>
 
   For a detailed view of the site's network layout, see our
-  <a href="https://github.com/git/git-scm.com/blob/master/ARCHITECTURE.md">architecture document</a>.
+  <a href="https://github.com/git/git-scm.com/blob/main/ARCHITECTURE.md">architecture document</a>.
 
 </div>