Use main as default branch in documentation

Bug: 1118433
Change-Id: I55d4c1cecf881d39c3189ed4fa4ef71db6eede08
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2981113
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

man/html/git-drover.html

@@ -966,7 +966,7 @@ Date:   Thu Apr 10 09:11:36 2014 +0000
 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</span>
 </code></pre></div></div><p><div class="paragraph"></p></div>
 <div class="paragraph"><p>If your cherrypick onto a release branch gets reverted, do not create a new
-cherrypick from master onto that release branch. Instead, use the "Reland"
+cherrypick from main onto that release branch. Instead, use the "Reland"
 button on the original cherrypick CL.</p></div>
 </div>
 <div class="sect3">

man/html/git-map-branches.html

@@ -851,7 +851,7 @@ assuming that the <code>frozen_changes</code> branch was currently checked out,
 <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 <span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}
 </span><span style="color: #19c518"></span><span style="color: #19c518">  no_upstream
-</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
+</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 </span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 </span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
@@ -859,7 +859,7 @@ assuming that the <code>frozen_changes</code> branch was currently checked out,
 </span><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 <span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 </span><span style="color: #19c518"></span><span style="color: #19c518">  no_upstream          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
-</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/master          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
+</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">        </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 </span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 </span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]

man/html/git-map.html

@@ -848,7 +848,7 @@ configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</
 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">27abea4	</span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">d8abe73	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
-* <span style="font-weight: bold; color: #e42e16">beec6f4	</span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff">    &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
+* <span style="font-weight: bold; color: #e42e16">beec6f4	</span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff">    &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
 * <span style="font-weight: bold; color: #e42e16">41290e0	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="font-weight: bold; color: #e42e16">a76fde7	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="font-weight: bold; color: #e42e16">9de7a71	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.

man/html/git-nav-downstream.html

@@ -773,7 +773,7 @@ command will prompt you with a selection of the branches.</p></div>
 <h2 id="_example">EXAMPLE</h2>
 <div class="sectionbody">
 <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master
+<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
 </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature
 </span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
@@ -781,14 +781,14 @@ command will prompt you with a selection of the branches.</p></div>
 </span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
 Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 Switched to branch 'cool_feature'
-Your branch is ahead of 'origin/master' by 4 commits.
+Your branch is ahead of 'origin/main' by 4 commits.
   (use "git push" to publish your local commits)
 Please select a downstream branch
   0. cool_feature
   1. fixit
 Selection (0-1)[0]: 0
 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature *
 </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
@@ -799,7 +799,7 @@ Your branch and 'cool_feature' have diverged,
 and have 2 and 1 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 </span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature *
 </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit

man/html/git-nav-upstream.html

@@ -771,23 +771,23 @@ checks that out.</p></div>
 <h2 id="_example">EXAMPLE</h2>
 <div class="sectionbody">
 <div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 </span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature *
 </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit
 </span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
 </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
 Switched to branch 'cool_feature'
-Your branch is ahead of 'origin/master' by 4 commits.
+Your branch is ahead of 'origin/main' by 4 commits.
   (use "git push" to publish your local commits)
 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
+<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature *
 </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
 </span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
 </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
-Note: switching to 'origin/master'.
+Note: switching to 'origin/main'.
 
 You are in 'detached HEAD' state. You can look around, make experimental</span> <b>&lt;1&gt;</b><span>
 changes and commit them, and you can discard any commits you make in this
@@ -806,7 +806,7 @@ Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master
+<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
 </span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature
 </span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 </span><span style="color: #19c518"></span><span style="color: #19c518">  fixit

man/html/git-reparent-branch.html

@@ -802,7 +802,7 @@ case.</p></div>
 </dt>
 <dd>
 <p>
-  Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em>. See
+  Reparent to track the <em>root</em> branch. Defaults to <em>origin/main</em>. See
   <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section..
 </p>
 </dd>

man/html/git-squash-branch.html

@@ -814,7 +814,7 @@ verify that the conflict diff is what you expected (and then skip it with
 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">27abea4	</span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">d8abe73	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
-* <span style="font-weight: bold; color: #e42e16">beec6f4	</span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff">    &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
+* <span style="font-weight: bold; color: #e42e16">beec6f4	</span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff">    &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
 * <span style="font-weight: bold; color: #e42e16">41290e0	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="font-weight: bold; color: #e42e16">a76fde7	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="font-weight: bold; color: #e42e16">9de7a71	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -834,7 +834,7 @@ verify that the conflict diff is what you expected (and then skip it with
 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">27abea4	</span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">d8abe73	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
-* <span style="font-weight: bold; color: #e42e16">beec6f4	</span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff">    &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
+* <span style="font-weight: bold; color: #e42e16">beec6f4	</span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/main</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff">    &lt;(cool_feature, fixit)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
 * <span style="font-weight: bold; color: #e42e16">41290e0	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="font-weight: bold; color: #e42e16">a76fde7	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="font-weight: bold; color: #e42e16">9de7a71	</span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.

man/man1/git-drover.1

@@ -247,7 +247,7 @@ Date:   Thu Apr 10 09:11:36 2014 +0000
 .\}
 .sp
 .sp
-If your cherrypick onto a release branch gets reverted, do not create a new cherrypick from master onto that release branch\&. Instead, use the "Reland" button on the original cherrypick CL\&.
+If your cherrypick onto a release branch gets reverted, do not create a new cherrypick from main onto that release branch\&. Instead, use the "Reland" button on the original cherrypick CL\&.
 .RE
 .sp
 .it 1 an-trap

man/man1/git-map-branches.1

@@ -163,7 +163,7 @@ Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and
 \fB$ git map\-branches\fR
 {NO_UPSTREAM}
   no_upstream
-origin/master
+origin/main
   cool_feature
     subfeature
   fixit
@@ -171,7 +171,7 @@ origin/master
 $ git map\-branches \-v\fR
 {NO_UPSTREAM}
   no_upstream
-origin/master
+origin/main
   cool_feature         [ 4 commits            ]
     subfeature         [ 2 commits | behind 1 ]
   fixit                [ 2 commits            ]

man/man1/git-map.1

@@ -151,7 +151,7 @@ Running \fIgit map\fR would result in an output something like:
 | * \fB27abea4	\fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
 | * \fBd8abe73	\fR 2014\-04\-10 ~ Add widget
 |/
-* \fBbeec6f4	\fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(cool_feature, fixit)\fR
+* \fBbeec6f4	\fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(cool_feature, fixit)\fR
 * \fB41290e0	\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7	\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a71	\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.

man/man1/git-nav-downstream.1

@@ -47,7 +47,7 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
 .\}
 .nf
 \fB$ git map\-branches\fR
-\fBorigin/master
+\fBorigin/main
 \fR  cool_feature
     subfeature
   fixit
@@ -55,14 +55,14 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
 \fB$ git nav\-downstream\fR
 Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 Switched to branch \*(Aqcool_feature\*(Aq
-Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
+Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
   (use "git push" to publish your local commits)
 Please select a downstream branch
   0\&. cool_feature
   1\&. fixit
 Selection (0\-1)[0]: 0
 \fB$ git map\-branches\fR
-origin/master
+origin/main
 \fB  cool_feature *
 \fR    subfeature
   fixit
@@ -73,7 +73,7 @@ Your branch and \*(Aqcool_feature\*(Aq have diverged,
 and have 2 and 1 different commits each, respectively\&.
   (use "git pull" to merge the remote branch into yours)
 \fB$ git map\-branches\fR
-origin/master
+origin/main
   cool_feature
 \fB    subfeature *
 \fR  fixit

man/man1/git-nav-upstream.1

@@ -47,23 +47,23 @@ git-nav-upstream \- Checkout the upstream branch of the currently checked out br
 .\}
 .nf
 \fB$ git map\-branches\fR
-origin/master
+origin/main
   cool_feature
 \fB    subfeature *
 \fR  fixit
     frozen_branch
 \fB$ git nav\-upstream\fR
 Switched to branch \*(Aqcool_feature\*(Aq
-Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
+Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
   (use "git push" to publish your local commits)
 \fB$ git map\-branches\fR
-origin/master
+origin/main
 \fB  cool_feature *
 \fR    subfeature
   fixit
     frozen_branch
 \fB$ git nav\-upstream\fR
-Note: switching to \*(Aqorigin/master\*(Aq\&.
+Note: switching to \*(Aqorigin/main\*(Aq\&.
 
 You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental  \fB(1)\fR
 changes and commit them, and you can discard any commits you make in this
@@ -82,7 +82,7 @@ Turn off this advice by setting config variable advice\&.detachedHead to false
 
 HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 \fB$ git map\-branches\fR
-\fBorigin/master
+\fBorigin/main
 \fR  cool_feature
     subfeature
   fixit

man/man1/git-new-branch.1

@@ -41,7 +41,7 @@ git-new-branch \- Create a new branch with correct tracking information\&.
 .sp
 .SH "DESCRIPTION"
 .sp
-Creates a new branch\&. By default the new branch will track the configured upstream for the repo (defaults to \fIorigin/master\fR)\&. If one of the other options is specified, it will track that other ref instead\&.
+Creates a new branch\&. By default the new branch will track the configured upstream for the repo (defaults to \fIorigin/main\fR)\&. If one of the other options is specified, it will track that other ref instead\&.
 .sp
 Conceptually, each branch in your repo represents one \fIChange List (CL)\fR\&. If you have many independent CLs (i\&.e\&. the changes in one do not interact with/depend on the changes in another), then you should create them as new branches tracking the default upstream (i\&.e\&. git new\-branch <branch_name>)\&. If you have features which depend on each other, you should create stacked branches using git new\-branch \-\-upstream_current <branch_name>\&.
 .SH "OPTIONS"
@@ -80,7 +80,7 @@ The name for the new branch\&.
 .SH "CONFIGURATION VARIABLES"
 .SS "depot\-tools\&.upstream"
 .sp
-This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin\fR\*(Aqs default branch or \fIorigin/master\fR if that can\(cqt be found\&. This is considered to be the \fIroot\fR branch\&.
+This configures the default \fIupstream\fR for all new branches\&. If it is unset, it defaults to \fIorigin\fR\*(Aqs default branch or \fIorigin/main\fR if that can\(cqt be found\&. This is considered to be the \fIroot\fR branch\&.
 .SH "EXAMPLE"
 .sp
 
@@ -90,14 +90,14 @@ This configures the default \fIupstream\fR for all new branches\&. If it is unse
 .\}
 .nf
 \fB$ git map\-branches \-v\fR
-origin/master
+origin/main
   cool_feature         [ ahead 4            ]
     subfeature         [ ahead 2 | behind 1 ]
   fixit                [ ahead 2            ]
 \fB    frozen_branch *    [ ahead 3            ]
 $ git new\-branch independent_cl\fR
 \fB$ git map\-branches \-v\fR
-\fBorigin/master
+\fBorigin/main
 \fR  cool_feature        [ ahead 4            ]
     subfeature        [ ahead 2 | behind 1 ]
   fixit               [ ahead 2            ]
@@ -105,7 +105,7 @@ $ git new\-branch independent_cl\fR
 \fB  independent_cl *
 $ vi foo && git add \-A && git commit \-m foo\fR
 \fB$ git map\-branches \-v\fR
-origin/master
+origin/main
   cool_feature        [ ahead 4            ]
     subfeature        [ ahead 2 | behind 1 ]
   fixit               [ ahead 2            ]
@@ -113,7 +113,7 @@ origin/master
 \fB  independent_cl *    [ ahead 1            ]
 $ git new\-branch \-\-upstream subfeature nested_cl\fR
 \fB$ git map\-branches \-v\fR
-origin/master
+origin/main
   cool_feature       [ ahead 4            ]
 \fB    subfeature       [ ahead 2 | behind 1 ]  \fR\fB\fB(1)\fR\fR\fB
       nested_cl *
@@ -122,11 +122,11 @@ origin/master
   independent_cl     [ ahead 1            ]
 \fB$ git checkout cool_feature\fR
 Switched to branch \*(Aqcool_feature\*(Aq
-Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
+Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
   (use "git push" to publish your local commits)
 \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
 \fB$ git map\-branches \-v\fR
-origin/master
+origin/main
 \fB  cool_feature                      [ ahead 4            ]
     cl_depends_on_cool_feature *
 \fR    subfeature                      [ ahead 2 | behind 1 ]
@@ -141,7 +141,7 @@ and have 2 and 1 different commits each, respectively\&.
   (use "git pull" to merge the remote branch into yours)
 \fB$ git new\-branch \-\-inject_current injected_cl\fR
 \fB$ git map\-branches \-v\fR
-origin/master
+origin/main
 \fB  cool_feature                      [ ahead 4            ]  \fR\fB\fB(1)\fR\fR\fB
     cl_depends_on_cool_feature
     injected_cl *

man/man1/git-reparent-branch.1

@@ -61,7 +61,7 @@ Reparent to track lkgr\&.
 Reparent to track the
 \fIroot\fR
 branch\&. Defaults to
-\fIorigin/master\fR\&. See
+\fIorigin/main\fR\&. See
 \fBgit-new-branch\fR(1)\*(Aqs CONFIGURATION VARIABLES section\&.\&.
 .RE
 .SH "SUGGESTED ALIASES"

man/man1/git-squash-branch.1

@@ -68,7 +68,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
 | * \fB27abea4	\fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
 | * \fBd8abe73	\fR 2014\-04\-10 ~ Add widget
 |/
-* \fBbeec6f4	\fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(cool_feature, fixit)\fR
+* \fBbeec6f4	\fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(cool_feature, fixit)\fR
 * \fB41290e0	\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7	\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a71	\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
@@ -88,7 +88,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
 | * \fB27abea4	\fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
 | * \fBd8abe73	\fR 2014\-04\-10 ~ Add widget
 |/
-* \fBbeec6f4	\fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(cool_feature, fixit)\fR
+* \fBbeec6f4	\fR (origin/main, origin/HEAD) 2014\-04\-10 ~ Make ReflectorImpl use mailboxes\fB    <(cool_feature, fixit)\fR
 * \fB41290e0	\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7	\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a71	\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.

man/src/demo_repo.sh

@@ -8,10 +8,10 @@ trap "rm -rf $TDIR" EXIT
 cd $TDIR
 silent git clone "$REMOTE" .
 silent git reset --hard stage_1
-silent git update-ref refs/remotes/origin/master stage_1
+silent git update-ref refs/remotes/origin/main stage_1
 silent git tag -d $(git tag -l 'stage_*')
-silent git checkout origin/master
-silent git branch -d master
+silent git checkout origin/main
+silent git branch -d main
 silent git config color.ui always
 
 if [[ ! "$BLANK_DEMO"  ]]

man/src/depot_tools_tutorial.demo.walkthrough.sh

@@ -118,7 +118,7 @@ comment "We haven't updated the code in a while, so let's do that now."
 pcommand git rebase-update
 echo Fetching origin
 git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
-silent git update-ref refs/remotes/origin/master stage_2
+silent git update-ref refs/remotes/origin/main stage_2
 silent git tag -d $(git tag -l 'stage_*')
 git rebase-update --no-fetch
 

man/src/depot_tools_tutorial.txt

@@ -221,7 +221,7 @@ begin a new CL:
 ----
 
 This will create and checkout a new branch named `branch_name` which will track
-the default upstream branch (`origin/master`). See
+the default upstream branch (`origin/main`). See
 linkgit:git-new-branch[1] for more features.
 
 Commit as many changes as you like to this branch. When you want to upload it
@@ -233,7 +233,7 @@ for review, run:
 ----
 
 This will take the diff of your branch against its upstream branch (in that
-case origin/master), and will post it to the
+case origin/main), and will post it to the
 link:https://chromium-review.googlesource.com[Chromium code review site].
 
 
@@ -302,9 +302,9 @@ bearings. Fortunately, 'depot_tools' has two tools to help you out:
 [white blue-background]##*##{zwsp}[blue-background red]** 7dcfe47       ** [green]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-12## \~ FREEZE.unindexed
 * [red]**4b0c180**        [yellow]##2014-03-12## \~ modfile
 * [red]**59a7cca**        [yellow]##2014-03-12## \~ a deleted file
-* [red]**6bec695**        [green]##(##{zwsp}[red]##origin/master##{zwsp}[green]##)## [yellow]##2014-03-11## \~ Add neat feature    [white]**<(frozen_changes)**
+* [red]**6bec695**        [green]##(##{zwsp}[red]##origin/main##{zwsp}[green]##)## [yellow]##2014-03-11## \~ Add neat feature    [white]**<(frozen_changes)**
 * [red]**d15a38a**        [yellow]##2014-03-11## \~ Epic README update
-* [red]**d559894**        [green]##(##{zwsp}[lime]**master**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Important upstream change
+* [red]**d559894**        [green]##(##{zwsp}[lime]**main**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Important upstream change
 [red]##|## * [red]**9c311fd**      [green]##(##{zwsp}[lime]**cool_feature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Respond to CL comments
 [red]##|## [green]##|## * [red]**2a1eeb2**    [green]##(##{zwsp}[lime]**subfeature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ integrate with CoolService
 [red]##|## [green]##|## * [red]**d777af6**    [yellow]##2014-03-11## \~ slick commenting action
@@ -320,11 +320,11 @@ Note that this example repo is in dire need of a linkgit:git-rebase-update[1]!
 [subs="quotes"]
 ----
 [white]**$ git map-branches**
-[red]#origin/master#
+[red]#origin/main#
   [green]#cool_feature#
     [green]#subfeature#
   [aqua]#frozen_changes *#
-  [green]#master#
+  [green]#main#
 ----
 
 linkgit:git-map[1]::
@@ -375,7 +375,7 @@ you want to base the new one on (i.e. CL 1), and then run:
 ----
 
 This will make a new branch which tracks the 'current' branch as its upstream
-(as opposed to 'origin/master'). All changes you commit to this branch will be
+(as opposed to 'origin/main'). All changes you commit to this branch will be
 in addition to the previous branch, but when you `git cl upload`, you will only
 upload the diff for the dependent (child) branch. You may have as many branches
 nested in this fashion as you like.
@@ -391,7 +391,7 @@ it, or even based 'another' branch off of that one. Or you discover that you
 have two independent CLs that would actually be much better off as dependent
 CLs. In instances like these, you can check out the offending branch and use
 linkgit:git-reparent-branch[1] to move it to track a different parent. Note that
-this can also be used to move a branch from tracking `origin/master` to `lkgr`
+this can also be used to move a branch from tracking `origin/main` to `lkgr`
 or vice versa.
 
 
@@ -428,7 +428,7 @@ DEPS::
 
 LKGR::
   Last Known Good Revision. This is a linkgit:git-tag[1] which tracks the last
-  version of `origin/master` which has passed the full set of testing on the
+  version of `origin/main` which has passed the full set of testing on the
   link:http://build.chromium.org[main Chromium waterfall].
 
 include::_footer.txt[]

man/src/git-drover.demo.common.sh

@@ -11,9 +11,9 @@ drover_c() {
   tick 1000
 }
 
-silent git push origin refs/remotes/origin/master:refs/branch-heads/9999
+silent git push origin refs/remotes/origin/main:refs/branch-heads/9999
 silent git config --add remote.origin.fetch \
   +refs/branch-heads/*:refs/remotes/branch-heads/*
 silent git fetch origin
 
-silent git checkout -B master origin/master
+silent git checkout -B main origin/main

man/src/git-drover.txt

@@ -82,7 +82,7 @@ Revert Example
 demo:2[]
 
 If your cherrypick onto a release branch gets reverted, do not create a new
-cherrypick from master onto that release branch. Instead, use the "Reland"
+cherrypick from main onto that release branch. Instead, use the "Reland"
 button on the original cherrypick CL.
 
 Manual Merge Example

man/src/git-nav-downstream.demo.1.sh

 #!/usr/bin/env bash
 . demo_repo.sh
 
-silent git checkout origin/master
+silent git checkout origin/main
 
 run git map-branches
 pcommand git nav-downstream

man/src/git-new-branch.txt

@@ -19,7 +19,7 @@ DESCRIPTION
 -----------
 
 Creates a new branch. By default the new branch will track the configured
-upstream for the repo (defaults to 'origin/master'). If one of the other options
+upstream for the repo (defaults to 'origin/main'). If one of the other options
 is specified, it will track that other ref instead.
 
 Conceptually, each branch in your repo represents one 'Change List (CL)'. If you
@@ -62,7 +62,7 @@ depot-tools.upstream
 ~~~~~~~~~~~~~~~~~~~~
 
 This configures the default 'upstream' for all new branches. If it is unset, it
-defaults to 'origin''s default branch or 'origin/master' if that can't be found.
+defaults to 'origin''s default branch or 'origin/main' if that can't be found.
 This is considered to be the 'root' branch.
 
 EXAMPLE

man/src/git-reparent-branch.txt

@@ -40,7 +40,7 @@ OPTIONS
   Reparent to track lkgr.
 
 --root::
-  Reparent to track the 'root' branch. Defaults to 'origin/master'. See
+  Reparent to track the 'root' branch. Defaults to 'origin/main'. See
   linkgit:git-new-branch[1]'s CONFIGURATION VARIABLES section..