Skip to content

Commit d0fb6d6

Browse files
calcmogulcalcmogul
committed
Replace references to master branch with main
1 parent d9e9e8f commit d0fb6d6

File tree

8 files changed

+53
-54
lines changed

8 files changed

+53
-54
lines changed

‎admin/software-for-non-software-team-members/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ <h2 id="What_leadership_should_know_about_the_software_team">What
114114
they can measure.</li>
115115
<li>We use version control. Each robot's code is stored in a
116116
"repository". We work on features separately in what's called a "branch",
117-
which are eventually merged into the "master" branch that always contains
117+
which are eventually merged into the "main" branch that always contains
118118
working code. We do this at competition too.</li>
119119
<li>We do code review for quality assurance. The site we use is
120120
<a href="https://github.com/frc3512">https://github.com/frc3512</a>,

‎ci/advanced-cpp/concurrency-and-atomics/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ <h2>The speed of concurrency (is lock-free faster?)</h2><iframe width="640"
5656
<h2 id="Examples_of_Lock-Free_Data_Structures">Examples of Lock-Free Data
5757
Structures</h2>
5858
<p>An atomic std::forward_list implementation: <a href=
59-
"https://raw.githubusercontent.com/calcmogul/atomic_lib/master/atomic_forward_list/src/atomic_forward_list.h">
59+
"https://raw.githubusercontent.com/calcmogul/atomic_lib/main/atomic_forward_list/src/atomic_forward_list.h">
6060
atomic_forward_list.h</a>.<br>
6161
An atomic std::stack implementation: <a href=
62-
"https://raw.githubusercontent.com/calcmogul/atomic_lib/master/atomic_stack/src/atomic_stack.h">
62+
"https://raw.githubusercontent.com/calcmogul/atomic_lib/main/atomic_stack/src/atomic_stack.h">
6363
atomic_stack.h</a>.</p>
6464
<p>Beware of implementation bugs. If any are found, file a bug at <a href=
6565
"https://github.com/calcmogul/atomic_lib/">https://github.com/calcmogul/atomic_lib/</a>.</p>

‎ci/github/index.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,29 @@ <h3 id="Versioning">Versioning</h3>
7676
<li>Getting to tagged commit later? (switch)</li>
7777
<ul>
7878
<li>now in detached head state</li>
79-
<li>can <code>git switch master</code> to get back to tip of
80-
master</li>
79+
<li>can <code>git switch main</code> to get back to tip of main</li>
8180
<li>can make commits</li>
8281
<ul>
8382
<li>make sure commits are saved?</li>
8483
<ul>
8584
<li><code>git branch temp</code></li>
8685
<li><code>git switch temp</code></li>
8786
</ul>
88-
<li>Update master to temp... WARNING: destructive!</li>
87+
<li>Update main to temp... WARNING: destructive!</li>
8988
<ul>
90-
<li><code>git branch -f master temp</code> (fine if changes on
91-
master were bad)</li>
92-
<li><code>git switch master</code></li>
89+
<li><code>git branch -f main temp</code> (fine if changes on main
90+
were bad)</li>
91+
<li><code>git switch main</code></li>
9392
</ul>
9493
<li>Or... merge it with HEAD</li>
9594
<ul>
9695
<li>Find commit from <code>git reflog</code></li>
97-
<li><code>git switch master</code></li>
96+
<li><code>git switch main</code></li>
9897
<li><code>git merge HEAD@{1}</code> (where <code>HEAD{1}</code> is
9998
commit in temp branch from reflog)</li>
10099
</ul>
101100
</ul>
102-
<li>Remove temp branch since it's reachable by master at HEAD now</li>
101+
<li>Remove temp branch since it's reachable by main at HEAD now</li>
103102
<ul>
104103
<li><code>git branch -d temp</code></li>
105104
</ul>
@@ -179,8 +178,8 @@ <h3 id="Revisions_to_patchset">Revisions to patchset</h3>
179178
the last line</i> during commit message modifications. Otherwise, a new
180179
patchset will be created instead.</p>
181180
<p>Verify this was done correctly by inspecting the output of <code>git log
182-
master..HEAD</code>. There should be only one commit listed and its
183-
Change-Id should match the old one.</p>
181+
main..HEAD</code>. There should be only one commit listed and its Change-Id
182+
should match the old one.</p>
184183
<h4 id="Uncommitted_changes">Uncommitted changes</h4>
185184
<pre>git commit --amend</pre>
186185
<h4 id="Squashing_committed_changes">Squashing committed changes</h4>

‎ci/github/lecture/index.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ <h1>Detached Head State</h1>
3939
<ul>
4040
<li>How to leave detached head state?</li>
4141
<ul>
42-
<li><code>git switch master</code></li>
43-
<li>Sets current HEAD to master's HEAD</li>
42+
<li><code>git switch main</code></li>
43+
<li>Sets current HEAD to main's HEAD</li>
4444
</ul>
4545
<li>Commits can be made here!</li>
4646
<ul>
@@ -57,22 +57,22 @@ <h1>Detached Head State</h1>
5757
<ul>
5858
<li>Options for temp branch</li>
5959
<ul>
60-
<li>Update master to temp... WARNING: destructive!</li>
60+
<li>Update main to temp... WARNING: destructive!</li>
6161
<ul>
62-
<li><code>git branch -f master temp</code></li>
63-
<li>Fine if changes on master were bad</li>
64-
<li><code>git switch master</code></li>
62+
<li><code>git branch -f main temp</code></li>
63+
<li>Fine if changes on main were bad</li>
64+
<li><code>git switch main</code></li>
6565
</ul>
6666
<li>Or... merge it with HEAD</li>
6767
<ul>
6868
<li>Find temp branch commit in reflog (ex: HEAD@{1})</li>
6969
<ul>
70-
<li><code>git switch master</code></li>
70+
<li><code>git switch main</code></li>
7171
<li><code>git merge HEAD@{1}</code></li>
7272
</ul>
7373
</ul>
7474
</ul>
75-
<li>temp is now reachable by master at HEAD</li>
75+
<li>temp is now reachable by main at HEAD</li>
7676
<ul>
7777
<li><code>git branch -d temp</code></li>
7878
</ul>
@@ -154,47 +154,47 @@ <h1>Interactive Rebase Example</h1>
154154
# x, exec = run command (the rest of the line) using shell</pre>
155155
</section>
156156
<section>
157-
<h1>Rebase Example</h1><code>git rebase --onto master client</code>
157+
<h1>Rebase Example</h1><code>git rebase --onto main client</code>
158158
<div style="text-align: center"><img src="res/rebase-example1.png" alt=
159159
"Rebase Example 1"></div>
160160
</section>
161161
<section>
162-
<h1>Rebase Example</h1><code>git rebase --onto master client</code>
162+
<h1>Rebase Example</h1><code>git rebase --onto main client</code>
163163
<div style="text-align: center"><img src="res/rebase-example2.png" alt=
164164
"Rebase Example 2"></div>
165165
</section>
166166
<section>
167-
<h1>Rebase Example</h1><code>git switch master</code><br>
167+
<h1>Rebase Example</h1><code>git switch main</code><br>
168168
<code>git merge client</code>
169169
<div style="text-align: center"><img src="res/rebase-example2.png" alt=
170170
"Rebase Example 2"></div>
171171
</section>
172172
<section>
173-
<h1>Rebase Example</h1><code>git switch master</code><br>
173+
<h1>Rebase Example</h1><code>git switch main</code><br>
174174
<code>git merge client</code>
175175
<div style="text-align: center"><img src="res/rebase-example3.png" alt=
176176
"Rebase Example 3"></div>
177177
</section>
178178
<section>
179-
<h1>Rebase Example</h1><code>git rebase --onto master server</code>
179+
<h1>Rebase Example</h1><code>git rebase --onto main server</code>
180180
<div style="text-align: center"><img src="res/rebase-example3.png" alt=
181181
"Rebase Example 3"></div>
182182
</section>
183183
<section>
184-
<h1>Rebase Example</h1><code>git rebase --onto master server</code>
184+
<h1>Rebase Example</h1><code>git rebase --onto main server</code>
185185
<div style="text-align: center"><img src="res/rebase-example4.png" alt=
186186
"Rebase Example 4"></div>
187187
</section>
188188
<section>
189-
<h1>Rebase Example</h1><code>git switch master</code><br>
189+
<h1>Rebase Example</h1><code>git switch main</code><br>
190190
<code>git merge server</code><br>
191191
<code>git branch -d client</code><br>
192192
<code>git branch -d server</code>
193193
<div style="text-align: center"><img src="res/rebase-example4.png" alt=
194194
"Rebase Example 4"></div>
195195
</section>
196196
<section>
197-
<h1>Rebase Example</h1><code>git switch master</code><br>
197+
<h1>Rebase Example</h1><code>git switch main</code><br>
198198
<code>git merge server</code><br>
199199
<code>git branch -d client</code><br>
200200
<code>git branch -d server</code>

‎ci/intro-to-git/index.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ <h3 id="Branches">Branches</h3>
140140
<li>Most of work will be done in them</li>
141141
<li>Making a branch (branch)</li>
142142
<li>Moving onto a branch (switch)</li>
143-
<li>Moving work onto master (merge)</li>
143+
<li>Moving work onto main (merge)</li>
144144
<ul>
145145
<li>What if merge goes wrong?</li>
146146
<ul>
@@ -151,12 +151,12 @@ <h3 id="Branches">Branches</h3>
151151
<li>Deleting a branch (branch -d)</li>
152152
</ul>
153153
<h2 id="Workflow">Workflow</h2>
154-
<p><code>master</code> is considered the stable branch which contains
155-
tested, working code. Work on features and bugfixes should occur on
156-
separate branches. Users should make as many commits on experimental
157-
branches as they feel is necessary. Before a branch is merged with
158-
<code>master</code>, intermediate commits are typically squashed to produce
159-
one or several feature, bugfix, or cleanup commits.</p>
154+
<p><code>main</code> is considered the stable branch which contains tested,
155+
working code. Work on features and bugfixes should occur on separate
156+
branches. Users should make as many commits on experimental branches as
157+
they feel is necessary. Before a branch is merged with <code>main</code>,
158+
intermediate commits are typically squashed to produce one or several
159+
feature, bugfix, or cleanup commits.</p>
160160
<h2 id="10_most_commonly_used_Git_commands">10 most commonly used Git
161161
commands</h2>
162162
<h3 id="1._Cloning_a_remote_repository">1. Cloning a remote repository</h3>
@@ -204,7 +204,7 @@ <h3 id="6._Pulling_commits_from_a_remote_repository">6. Pulling commits
204204
<code>&lt;refspec&gt;</code> isn't specified, Git will attempt to pull
205205
changes from a remote branch with the same name as the currently checked
206206
out branch.</p>
207-
<p><i>example:</i> <code>git pull origin/master</code></p>
207+
<p><i>example:</i> <code>git pull origin/main</code></p>
208208
<h3 id="7._Creating_a_branch">7. Creating a branch</h3>
209209
<pre>git branch &lt;branchname&gt;</pre>
210210
<p>This creates a new branch starting at the current commit. Omitting
@@ -219,7 +219,7 @@ <h3 id="8._Deleting_a_branch">8. Deleting a branch</h3>
219219
<h3 id="9._Switching_to_a_branch">9. Switching to a branch</h3>
220220
<pre>git switch &lt;branchname&gt;</pre>
221221
<p>This checks out <code>&lt;branchname&gt;</code>. The default branch when
222-
a new project is created is called <code>master</code>.</p>
222+
a new project is created is called <code>main</code>.</p>
223223
<p><i>example:</i> <code>git switch other-branch</code></p>
224224
<h3 id="10._Merging_a_branch">10. Merging a branch</h3>
225225
<pre>git merge &lt;branchname&gt;</pre>

‎ci/intro-to-git/lecture/index.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ <h1>Exchanging Changes with Others</h1>
216216
<ul>
217217
<li>"Push" changes out<br>
218218
<code>git push [&lt;local branch&gt;]</code><br>
219-
ex: <code>git push origin master</code></li>
219+
ex: <code>git push origin main</code></li>
220220
<li>"Pull" changes in (fetch + merge)<br>
221221
<code>git pull [&lt;remote branch&gt;]</code><br>
222-
ex: <code>git pull origin/master</code></li>
222+
ex: <code>git pull origin/main</code></li>
223223
<li>"origin" is a remote</li>
224224
</ul>
225225
</section>
@@ -256,27 +256,27 @@ <h1>Branch Example</h1><code>git branch iss53</code><br>
256256
alt="Branch Example After"></div>
257257
</section>
258258
<section>
259-
<h1>Branch Example</h1><code>git switch master</code><br>
259+
<h1>Branch Example</h1><code>git switch main</code><br>
260260
<code>git switch -c hotfix</code><br>
261261
<code>git commit</code>
262262
<div style="text-align: center"><img src=
263263
"res/branch-example2-before.png" alt="Branch Example 2 Before"></div>
264264
</section>
265265
<section>
266-
<h1>Branch Example</h1><code>git switch master</code><br>
266+
<h1>Branch Example</h1><code>git switch main</code><br>
267267
<code>git switch -c hotfix</code><br>
268268
<code>git commit</code>
269269
<div style="text-align: center"><img src=
270270
"res/branch-example2-after.png" alt="Branch Example 2 After"></div>
271271
</section>
272272
<section>
273-
<h1>Branch Example</h1><code>git switch master</code><br>
273+
<h1>Branch Example</h1><code>git switch main</code><br>
274274
<code>git merge hotfix</code>
275275
<div style="text-align: center"><img src=
276276
"res/branch-example3-before.png" alt="Branch Example 3 Before"></div>
277277
</section>
278278
<section>
279-
<h1>Branch Example</h1><code>git switch master</code><br>
279+
<h1>Branch Example</h1><code>git switch main</code><br>
280280
<code>git merge hotfix</code>
281281
<div style="text-align: center"><img src=
282282
"res/branch-example3-after.png" alt="Branch Example 3 After"></div>
@@ -301,14 +301,14 @@ <h1>Branch Example - Merge</h1>
301301
alt="Branch Example Merge"></div>
302302
</section>
303303
<section>
304-
<h1>Branch Example - Merge</h1><code>git switch master</code><br>
304+
<h1>Branch Example - Merge</h1><code>git switch main</code><br>
305305
<code>git merge iss53</code>
306306
<div style="text-align: center"><img src=
307307
"res/branch-example-merge2-before.png" alt=
308308
"Branch Example Merge 2 Before"></div>
309309
</section>
310310
<section>
311-
<h1>Branch Example - Merge</h1><code>git switch master</code><br>
311+
<h1>Branch Example - Merge</h1><code>git switch main</code><br>
312312
<code>git merge iss53</code>
313313
<div style="text-align: center"><img src=
314314
"res/branch-example-merge2-after.png" alt=

‎ci/intro-to-shell-scripting/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h2 id="Examples">Examples</h2>
6969
<pre>
7070
#!/bin/bash
7171

72-
git switch -q master
72+
git switch -q main
7373
read -r -a array &gt; data.csv
7474
else
7575
echo $x$','$y','$x$','$y &gt;&gt; data.csv
@@ -99,8 +99,8 @@ <h2 id="Examples">Examples</h2>
9999
fi
100100

101101
if [ "$1" == "rebase" ]; then
102-
git switch -q master
103-
git pull -q upstream master
102+
git switch -q main
103+
git pull -q upstream main
104104
fi
105105

106106
branches=()
@@ -123,7 +123,7 @@ <h2 id="Examples">Examples</h2>
123123
"build")
124124
if [ "$base" == "itable-base" ] ||
125125
[ "$base" == "kalman-filter" ] ||
126-
[ "$base" == "master" ] ||
126+
[ "$base" == "main" ] ||
127127
[ "$base" == "motion-profile" ] ||
128128
[ "$base" == "pid-dt" ]; then
129129
continue
@@ -136,7 +136,7 @@ <h2 id="Examples">Examples</h2>
136136
"buildsim")
137137
if [ "$base" == "itable-base" ] ||
138138
[ "$base" == "kalman-filter" ] ||
139-
[ "$base" == "master" ] ||
139+
[ "$base" == "main" ] ||
140140
[ "$base" == "motion-profile" ] ||
141141
[ "$base" == "pid-dt" ]; then
142142
continue
@@ -165,7 +165,7 @@ <h2 id="Examples">Examples</h2>
165165
[ "$base" != "itable-base" ] &amp;&
166166
[ "$base" != "motor-safety-base" ] &amp;&
167167
[ "$base" != "pid-filter" ]; then
168-
git rebase master
168+
git rebase main
169169
fi
170170
;;
171171
"setorigin")

‎ci/robot-software/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ <h3 id="Robot_download">Robot download</h3>
312312
<h3 id="Initial_commit">Initial commit</h3>
313313
<p>After the files are added to the repository, they should be committed in
314314
the first commit with the commit message "Initial Commit". This can then be
315-
pushed to Gerrit for review or pushed directly to master by admins. Gerrit
316-
will automatically mirror commits to master on GitHub.</p>
315+
pushed to Gerrit for review or pushed directly to main by admins. Gerrit
316+
will automatically mirror commits to main on GitHub.</p>
317317
</div>
318318
</body>
319319
</html>

0 commit comments

Comments
 (0)