commit 83f7eddbfbf66c0a2ffecc4639c6da642711bd7e
from: Stefan Sperling <stsp@stsp.name>
date: Mon Jun 15 14:20:36 2020 UTC

main branch

commit - ec51d4a3d8c89754349e906827f09f5fb7861095
commit + 83f7eddbfbf66c0a2ffecc4639c6da642711bd7e
blob - 65a9fb17ac24441e1cbd70f290b3cf962eb88dc9
blob + ca4d5414298958bb38decbc4ae8dc03a7011dad9
--- examples.html
+++ examples.html
@@ -284,12 +284,12 @@ This section explains how such a mistake can be correc
 
 <p>
 As a first step, Got can create another commit which undoes the changes
-made by the latest commit. Assuming a branch called <tt>master</tt>,
+made by the latest commit. Assuming a branch called <tt>main</tt>,
 the latest commit on this branch can be identified by the same
-name (<tt>master</tt>).
+name (<tt>main</tt>).
 In a clean work tree according to <tt>got status</tt>, run:
 <pre class="cmdbox">
-$ <b>got backout master</b>
+$ <b>got backout main</b>
 $ <b>got commit -m 'oops, roll back previous change'</b>
 </pre>
 
@@ -297,7 +297,7 @@ Using <tt>got backout</tt> a second time will now fetc
 change into the work tree as a local change which can be amended:</p>
 
 <pre class="cmdbox">
-$ <b>got backout master</b>
+$ <b>got backout main</b>
 (edit files)
 $ <b>got commit -m 'fixed version of previous change'</b>
 </pre>
@@ -308,7 +308,7 @@ now look something like this:
 <pre class="cmdbox">
 $ <b>got log -l 3</b>
 -----------------------------------------------
-commit bcb49d15e041ddffb59397d2fe851fdb1729b005 (master)
+commit bcb49d15e041ddffb59397d2fe851fdb1729b005 (main)
 from: Flan Hacker &lt;flan_hacker@openbsd.org&gt;
 date: Wed Aug 14 22:07:22 2038 UTC
  
@@ -341,7 +341,7 @@ mistake. First, find the ID of the parent commit of th
  
 <pre class="cmdbox">
 $ <b>got log -l 4 | grep ^commit| tail -n 1</b>
-commit e27a7222faaa171dcb086ea0b566dc7bebb74a0b (origin/master)
+commit e27a7222faaa171dcb086ea0b566dc7bebb74a0b (origin/main)
 </pre>
 
 <p>
@@ -388,7 +388,7 @@ version of history which does not contain the mistake:
 <pre class="cmdbox">
 $ <b>got log -l 1</b>
 -----------------------------------------------
-commit 60b83404dd25547f19d9b468b931809541a3325c (master)
+commit 60b83404dd25547f19d9b468b931809541a3325c (main)
 from: Flan Hacker &lt;flan_hacker@openbsd.org&gt;
 date: Wed Aug 14 22:17:12 2038 UTC