python -> python3 in depot_tools tutorial, and regenerate docs.

Bug: 416084048
Change-Id: I79badc2944ea9f92ace246853f1bf699a3ff0147
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6521565
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>

man/html/depot_tools.html

@@ -920,7 +920,7 @@ Print a diff of the current branch, compared to its upstream.
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/depot_tools_gerrit_auth.html

@@ -812,7 +812,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-04-17 21:57:51 UTC
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/depot_tools_tutorial.html

@@ -943,8 +943,8 @@ If you see strange errors with the file system on the first run of gclient,
 </li>
 <li>
 <p>
-After running gclient open a command prompt and type <code>where python</code> and confirm that
-  the depot_tools python.bat comes ahead of any copies of python.exe. Failing to ensure
+After running gclient open a command prompt and type <code>where python3</code> and confirm that
+  the depot_tools python3.bat comes ahead of any copies of python3.exe. Failing to ensure
   this can lead to overbuilding when using gn - see
   <a href="https://issues.chromium.org/issues/41253477">crbug.com/41253477</a>.
 </p>
@@ -1257,27 +1257,17 @@ updating, and committing multiple CLs.</p></div>
 </code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git new-branch fix_typo</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt</span>
-1772
-?
-?
-1772
+1503
+It was a Domo-Banana.
+It was a Domo-Kuun.
+1501
 <span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'Fix terrible typo.'</span>
-On branch fix_typo
-Your branch is up to date with 'origin/master'.
-
-nothing to commit, working tree clean
+[fix_typo 615ffa7] Fix terrible typo.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 <span style="font-weight: bold; color: #BFBFBF">$ git map</span>
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add best chapter2 ever!
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1288,7 +1278,8 @@ nothing to commit, working tree clean
 
 <span style="font-weight: bold; color: #BFBFBF">$ git status</span>
 On branch fix_typo
-Your branch is up to date with 'origin/master'.
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
 
 nothing to commit, working tree clean
 
@@ -1297,10 +1288,9 @@ nothing to commit, working tree clean
 </code></pre></div></div><p><div class="paragraph"> While we wait for feedback, let's do something else.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git new-branch chap2</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
-<span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">origin/master
+<span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">origin/main
 </span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  chap2 *
-</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  fix_typo
-</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  master
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  fix_typo
 </span>
 <span style="font-weight: bold; color: #BFBFBF">$ cat &gt;&gt; build/whitespace_file.txt &lt;&lt;EOF</span>
 
@@ -1310,7 +1300,7 @@ when the fan was last cleaned.
 EOF
 <span style="font-weight: bold; color: #BFBFBF">$ git status</span>
 On branch chap2
-Your branch is up to date with 'origin/master'.
+Your branch is up to date with 'origin/main'.
 
 Changes not staged for commit:
   (use "git add &lt;file&gt;..." to update what will be committed)
@@ -1323,36 +1313,41 @@ no changes added to commit (use "git add" and/or "git commit -a")
 
 <span style="font-weight: bold; color: #BFBFBF">$ git checkout fix_typo</span>
 Switched to branch 'fix_typo'
-Your branch is up to date with 'origin/master'.
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
 
 <span style="font-weight: bold; color: #BFBFBF">$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt</span>
-1772
-?
-?
-1772
+1501
+It was a Domo-Kuun.
+It was a Domo-Kun.
+1500
 <span style="font-weight: bold; color: #BFBFBF">$ git upstream-diff --wordwise</span>
+<span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span>
+<span style="font-weight: bold">index 3eba355..57cdcee 100644</span>
+<span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
+<span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
+<span style="color: #8BE9FD">@@ -17,7 +17,7 @@</span> swept up the streets (for it is in London that our scene lies), rattling along
+the housetops, and fiercely agitating the scanty flame of the lamps that
+struggled against the elements. A hooded figure emerged.
 
-<span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'Fix typo for good!'</span>
-On branch fix_typo
-Your branch is up to date with 'origin/master'.
+It was a Domo-<span style="color: #FF5555">Banana</span><span style="color: #50FA7B">Kun</span>.
 
-nothing to commit, working tree clean
+"What took you so long?", inquired his wife.
+
+
+<span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'Fix typo for good!'</span>
+[fix_typo 2c0ad9c] Fix typo for good!
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 <span style="font-weight: bold; color: #BFBFBF">$ git cl upload</span>
 ... truncated output ...
 </code></pre></div></div><p><div class="paragraph"> Since we got lgtm, let the CQ land it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git cl set_commit</span>
 <span style="font-weight: bold; color: #BFBFBF">$ git map</span>
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a939958dff</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ FREEZE.unindexed
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add best chapter2 ever!
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">0e2e52e72e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ FREEZE.unindexed
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Fix typo for good!
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
+<span style="color: #FF5555">|</span><span style="color: #FF5555">/</span>
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1362,82 +1357,90 @@ nothing to commit, working tree clean
 
 
 </code></pre></div></div><p><div class="paragraph"> Switch back to where we were using the nav* commands (for fun... git checkout would work here too)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
-<span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">origin/master
-</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  chap2
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  chap2
 </span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  fix_typo *
-</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  master
 </span>
 <span style="font-weight: bold; color: #BFBFBF">$ git nav-upstream</span>
-HEAD is now at 59cdb73 Refactor data interchange format.
+Note: switching to 'origin/main'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c &lt;new-branch-name&gt;
+
+Or undo this operation with:
+
+  git switch -
+
+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: #BFBFBF">$ git nav-downstream</span>
-Previous HEAD position was 59cdb73 Refactor data interchange format.
+Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 Switched to branch 'chap2'
-Your branch is ahead of 'origin/master' by 1 commit.
+Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)
 Please select a downstream branch
   0. chap2
   1. fix_typo
-  2. master
-Selection (0-2)[0]: 0
+Selection (0-1)[0]: 0
 <span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
-<span style="color: #FF5555"></span><span style="color: #FF5555">origin/master
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
 </span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  chap2 *
 </span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  fix_typo
-</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  master
 </span>
 </code></pre></div></div><p><div class="paragraph"> Now we can pick up on chapter2 where we left off.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git thaw</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ git diff</span>
-diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
-index 1293282..0ae5a14 100644
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@ -43,3 +43,7 @@ There was an poignant pause.
-
- CHAPTER 3:
- Hilariousness! This chapter is awesome!
-+
-+"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
-+overhead, barely disturbing the thick cigarette smoke. No doubt was left about
-+when the fan was last cleaned.
+<span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span>
+<span style="font-weight: bold">index 3eba355..9d08d9d 100644</span>
+<span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
+<span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
+<span style="color: #8BE9FD">@@ -34,3 +34,7 @@</span> with his fork, watching the runny jelly spread and pool across his plate,
+ like the blood of a dying fawn. \"It reminds me of that time --\" he started, as
+ his wife cut in quickly: \"-- please. I can't bear to hear it.\". A flury of
+ images coming from the past flowed through his mind.
+<span style="color: #50FA7B">+</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">overhead, barely disturbing the thick cigarette smoke. No doubt was left about</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">when the fan was last cleaned.</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ cat &gt;&gt; build/whitespace_file.txt &lt;&lt;EOF</span>
 
 There was an poignant pause.
 EOF
 <span style="font-weight: bold; color: #BFBFBF">$ git diff</span>
-diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
-index 1293282..a63d04e 100644
---- a/build/whitespace_file.txt
-+++ b/build/whitespace_file.txt
-@@ -43,3 +43,9 @@ There was an poignant pause.
-
- CHAPTER 3:
- Hilariousness! This chapter is awesome!
-+
-+"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
-+overhead, barely disturbing the thick cigarette smoke. No doubt was left about
-+when the fan was last cleaned.
-+
-+There was an poignant pause.
+<span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span>
+<span style="font-weight: bold">index 3eba355..e3a55de 100644</span>
+<span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
+<span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
+<span style="color: #8BE9FD">@@ -34,3 +34,9 @@</span> with his fork, watching the runny jelly spread and pool across his plate,
+ like the blood of a dying fawn. \"It reminds me of that time --\" he started, as
+ his wife cut in quickly: \"-- please. I can't bear to hear it.\". A flury of
+ images coming from the past flowed through his mind.
+<span style="color: #50FA7B">+</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">overhead, barely disturbing the thick cigarette smoke. No doubt was left about</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">when the fan was last cleaned.</span>
+<span style="color: #50FA7B">+</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">There was an poignant pause.</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'Finish chapter 2'</span>
-[chap2 d4a9451] Finish chapter 2
+[chap2 ceef712] Finish chapter 2
  1 file changed, 6 insertions(+)
 
 <span style="font-weight: bold; color: #BFBFBF">$ git map</span>
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d4a945118e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add best chapter2 ever!
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">ceef712d7f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Fix typo for good!
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
+<span style="color: #FF5555">|</span><span style="color: #FF5555">/</span>
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1458,22 +1461,16 @@ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
 began feeling sick.
 EOF
 <span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'beginning of chapter 3'</span>
-[chap3 d2902ef] beginning of chapter 3
+[chap3 7d4238a] beginning of chapter 3
  1 file changed, 4 insertions(+)
 
 <span style="font-weight: bold; color: #BFBFBF">$ git map</span>
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d2902efc4d</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ beginning of chapter 3
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d4a945118e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">fix_typo, chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add best chapter2 ever!
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4238a1e2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ beginning of chapter 3
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">ceef712d7f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Fix typo for good!
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
+<span style="color: #FF5555">|</span><span style="color: #FF5555">/</span>
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">chap2, fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@@ -1485,23 +1482,21 @@ EOF
 </code></pre></div></div><p><div class="paragraph"> We haven't updated the code in a while, so let's do that now.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git rebase-update</span>
 Fetching origin
 From https://upstream
-<span style="font-weight: bold">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> up-to-date
-<span style="font-weight: bold">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> up-to-date
-Rebasing: <span style="font-weight: bold">master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
-<span style="font-weight: bold">chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> up-to-date
-Deleted branch fix_typo (was 59cdb73).
-Deleted branch master (was 59cdb73).
+   beec6f4..59cdb73  main       -&gt; origin/main
+Rebasing: <span style="font-weight: bold">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
+Rebasing: <span style="font-weight: bold">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
+Failed! Attempting to squash <span style="font-weight: bold">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> ... Success!
+Rebasing: <span style="font-weight: bold">chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
+Reparented chap3 to track origin/main (was tracking chap2)
+Deleted branch fix_typo (was 5d26fec).
+Deleted branch chap2 (was 5d26fec).
 
 Running `git gc --auto` - Ctrl-C to abort is OK.
 </code></pre></div></div><p><div class="paragraph"> Well look at that. The CQ landed our typo and chapter2 branches  already and git rebase-update cleaned them up for us.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ gclient sync</span>
 ... truncated output ...
 <span style="font-weight: bold; color: #BFBFBF">$ git map</span>
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d2902efc4d</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ beginning of chapter 3
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d4a945118e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add best chapter2 ever!
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">93fe917ad1</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ beginning of chapter 3
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
@@ -1519,21 +1514,48 @@ Running `git gc --auto` - Ctrl-C to abort is OK.
 </code></pre></div></div><p><div class="paragraph"> Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before continuing. Brace for a code conflict!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git rebase-update</span>
 Fetching origin
 From https://upstream
+   5d26fec..59cdb73  main       -&gt; origin/main
 Rebasing: chap2
 ... lots of output, it's a conflict alright :(...
 <span style="font-weight: bold; color: #BFBFBF">$ git diff</span>
+<span style="font-weight: bold">diff --cc build/whitespace_file.txt</span>
+<span style="font-weight: bold">index 1293282,f903ea2..0000000</span>
+<span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
+<span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
+<span style="color: #8BE9FD">@@@ -42,4 -42,5 +42,9 @@@</span> when the fan was last cleaned
+  There was an poignant pause.
+
+  CHAPTER 3:
+<span style="color: #50FA7B">++&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</span>
+<span style="color: #50FA7B"> +Hilariousness! This chapter is awesome!</span>
+<span style="color: #50FA7B">++=======</span>
+<span style="color: #50FA7B">+ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
+<span style="color: #50FA7B">+ began feeling sick.</span>
+<span style="color: #50FA7B">++&gt;&gt;&gt;&gt;&gt;&gt;&gt; 93fe917 (beginning of chapter 3)</span>
 
 </code></pre></div></div><p><div class="paragraph"> Oh, well, that's not too bad. In fact... that's a terrible chapter 3!</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ $EDITOR build/whitespace_file.txt</span>
 ... /me deletes bad chapter 3 ...
 <span style="font-weight: bold; color: #BFBFBF">$ git add build/whitespace_file.txt</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ git diff --cached</span>
+<span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt</span>
+<span style="font-weight: bold">index 1293282..f903ea2 100644</span>
+<span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
+<span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
+<span style="color: #8BE9FD">@@ -42,4 +42,5 @@</span> when the fan was last cleaned.
+ There was an poignant pause.
+
+ CHAPTER 3:
+<span style="color: #FF5555">-Hilariousness! This chapter is awesome!</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
+<span style="color: #50FA7B">+</span><span style="color: #50FA7B">began feeling sick.</span>
 
 </code></pre></div></div><p><div class="paragraph"> Much better</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git rebase --continue</span>
+[detached HEAD 1cb4f5b] beginning of chapter 3
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 <span style="font-weight: bold; color: #BFBFBF">$ git rebase-update</span>
 Fetching origin
-<span style="font-weight: bold">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> up-to-date
 <span style="font-weight: bold">chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> up-to-date
 
 Running `git gc --auto` - Ctrl-C to abort is OK.
@@ -1541,12 +1563,11 @@ Running `git gc --auto` - Ctrl-C to abort is OK.
 <span style="font-weight: bold; color: #BFBFBF">$ gclient sync</span>
 ... truncated output ...
 <span style="font-weight: bold; color: #BFBFBF">$ git map</span>
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d2902efc4d</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ beginning of chapter 3
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d4a945118e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/master</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">1cb4f5b622</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ beginning of chapter 3
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor data interchange format.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add best chapter2 ever!
-* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Finish chapter 2
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Fix terrible typo.
 * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
@@ -1626,7 +1647,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-04-09 23:42:05 UTC
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-cl.html

@@ -1036,7 +1036,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-footers.html

@@ -877,7 +877,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-freeze.html

@@ -794,7 +794,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
 <span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
 
 <span style="font-weight: bold; color: #BFBFBF">$ git log -n 2 --stat</span>
-<span style="color: #F1FA8C">commit c6dbdcb1f59cc61d7d7a8d907714f522921028d2</span>
+<span style="color: #F1FA8C">commit c7156eec5ff3a3eb2353981642d74b4900ff60d9</span>
 Author: local &lt;local@chromium.org&gt;
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
@@ -806,7 +806,7 @@ Date:   Thu Apr 10 08:54:56 2014 +0000
  unstaged_deleted_file            | 1 <span style="color: #FF5555">-</span>
  4 files changed, 2 insertions(+), 1 deletion(-)
 
-<span style="color: #F1FA8C">commit db8b1e90a83f18f6edfe663414ec4abb099a8804</span>
+<span style="color: #F1FA8C">commit dc40aa21014450e3d15a518059f0974051b33373</span>
 Author: local &lt;local@chromium.org&gt;
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
@@ -859,7 +859,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-hyper-blame.html

@@ -873,7 +873,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-map-branches.html

@@ -901,7 +901,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-map.html

@@ -882,7 +882,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-mark-merge-base.html

@@ -821,7 +821,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-nav-downstream.html

@@ -843,7 +843,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-nav-upstream.html

@@ -853,7 +853,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-new-branch.html

@@ -972,7 +972,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-rebase-update.html

@@ -973,7 +973,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-rename-branch.html

@@ -789,7 +789,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-reparent-branch.html

@@ -842,7 +842,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-retry.html

@@ -853,7 +853,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-squash-branch.html

@@ -878,7 +878,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-thaw.html

@@ -789,7 +789,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/html/git-upstream-diff.html

@@ -918,7 +918,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2025-02-20 16:05:41 PST
+ 2025-05-07 21:15:19 UTC
 </div>
 </div>
 </body>

man/man1/git-cl.1

@@ -2,12 +2,12 @@
 .\"     Title: git-cl
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-CL" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-CL" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-footers.1

@@ -2,12 +2,12 @@
 .\"     Title: git-footers
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-FOOTERS" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-FOOTERS" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-freeze.1

@@ -2,12 +2,12 @@
 .\"     Title: git-freeze
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-FREEZE" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-FREEZE" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -63,7 +63,7 @@ D  deleted_file
 \fB$ git status \-\-short\fR
 
 \fB$ git log \-n 2 \-\-stat\fR
-commit dfe24b962f4994c628938662dc2ff5802163313f
+commit aca3fe411dc94cc71007253433658bcc4a15827f
 Author: local <local@chromium\&.org>
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
@@ -75,7 +75,7 @@ Date:   Thu Apr 10 08:54:56 2014 +0000
  unstaged_deleted_file            | 1 \-
  4 files changed, 2 insertions(+), 1 deletion(\-)
 
-commit 2e8f1ac75f5a7c2ac28d3a22677d59724e3cbcb1
+commit 3e9cd7df0e8f5c7a6c9b47a8637c49c180d22222
 Author: local <local@chromium\&.org>
 Date:   Thu Apr 10 08:54:56 2014 +0000
 

man/man1/git-hyper-blame.1

@@ -2,12 +2,12 @@
 .\"     Title: git-hyper-blame
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-HYPER\-BLAME" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-HYPER\-BLAME" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-map-branches.1

@@ -2,12 +2,12 @@
 .\"     Title: git-map-branches
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-MAP\-BRANCHES" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-MAP\-BRANCHES" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-map.1

@@ -2,12 +2,12 @@
 .\"     Title: git-map
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-MAP" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-MAP" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-mark-merge-base.1

@@ -2,12 +2,12 @@
 .\"     Title: git-mark-merge-base
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-MARK\-MERGE\-BA" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-MARK\-MERGE\-BA" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-nav-downstream.1

@@ -2,12 +2,12 @@
 .\"     Title: git-nav-downstream
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-NAV\-DOWNSTREAM" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-NAV\-DOWNSTREAM" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-nav-upstream.1

@@ -2,12 +2,12 @@
 .\"     Title: git-nav-upstream
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-NAV\-UPSTREAM" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-NAV\-UPSTREAM" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-new-branch.1

@@ -2,12 +2,12 @@
 .\"     Title: git-new-branch
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-NEW\-BRANCH" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-NEW\-BRANCH" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-rebase-update.1

@@ -2,12 +2,12 @@
 .\"     Title: git-rebase-update
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-REBASE\-UPDATE" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-REBASE\-UPDATE" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-rename-branch.1

@@ -2,12 +2,12 @@
 .\"     Title: git-rename-branch
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-RENAME\-BRANCH" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-RENAME\-BRANCH" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-reparent-branch.1

@@ -2,12 +2,12 @@
 .\"     Title: git-reparent-branch
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-REPARENT\-BRANC" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-REPARENT\-BRANC" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-retry.1

@@ -2,12 +2,12 @@
 .\"     Title: git-retry
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-RETRY" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-RETRY" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-squash-branch.1

@@ -2,12 +2,12 @@
 .\"     Title: git-squash-branch
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-SQUASH\-BRANCH" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-SQUASH\-BRANCH" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-thaw.1

@@ -2,12 +2,12 @@
 .\"     Title: git-thaw
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-THAW" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-THAW" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man1/git-upstream-diff.1

@@ -2,12 +2,12 @@
 .\"     Title: git-upstream-diff
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "GIT\-UPSTREAM\-DIFF" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "GIT\-UPSTREAM\-DIFF" "1" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man7/depot_tools.7

@@ -2,12 +2,12 @@
 .\"     Title: depot_tools
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/20/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 8a5ec2b9
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "DEPOT_TOOLS" "7" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
+.TH "DEPOT_TOOLS" "7" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man7/depot_tools_gerrit_auth.7

@@ -2,12 +2,12 @@
 .\"     Title: depot_tools_gerrit_auth
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 04/17/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools efc195849
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "DEPOT_TOOLS_GERRIT_A" "7" "04/17/2025" "depot_tools efc195849" "Chromium depot_tools Manual"
+.TH "DEPOT_TOOLS_GERRIT_A" "7" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

man/man7/depot_tools_tutorial.7

@@ -2,12 +2,12 @@
 .\"     Title: depot_tools_tutorial
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 04/09/2025
+.\"      Date: 05/07/2025
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 41d6af4d2
+.\"    Source: depot_tools fab0a429
 .\"  Language: English
 .\"
-.TH "DEPOT_TOOLS_TUTORIAL" "7" "04/09/2025" "depot_tools 41d6af4d2" "Chromium depot_tools Manual"
+.TH "DEPOT_TOOLS_TUTORIAL" "7" "05/07/2025" "depot_tools fab0a429" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -584,27 +584,17 @@ Let\*(Aqs fix something!
 \fB$ git new\-branch fix_typo\fR
 
 \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
-1772
-?
-?
-1772
+1503
+It was a Domo\-Banana\&.
+It was a Domo\-Kuun\&.
+1501
 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR
-On branch fix_typo
-Your branch is up to date with \*(Aqorigin/master\*(Aq\&.
-
-nothing to commit, working tree clean
+[fix_typo 615ffa7] Fix terrible typo\&.
+ 1 file changed, 1 insertion(+), 1 deletion(\-)
 
 \fB$ git map\fR
-* \fB59cdb7335b\fR	\fB(HEAD \-> fix_typo\fR\fB, origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.
-* \fB34676a3583\fR	2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
-* \fB7d4784e867\fR	2014\-04\-10 ~ Add best chapter2 ever!
-* \fB5d26fec369\fR	2014\-04\-10 ~ Finish chapter 2
-* \fBdf7fefbf06\fR	2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
-* \fB4b39cda0ac\fR	2014\-04\-10 ~ Fix terrible typo\&.
-* \fB248c5b6fe3\fR	2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
-* \fB8171df8af9\fR	2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
-* \fBd6a30d2e56\fR	2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
-* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBmaster\fR)
+* \fB615ffa720f\fR	\fB(HEAD \-> fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix terrible typo\&.
+* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes
 * \fB41290e02b7\fR	2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7b7b\fR	2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a713b3\fR	2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
@@ -615,7 +605,8 @@ nothing to commit, working tree clean
 
 \fB$ git status\fR
 On branch fix_typo
-Your branch is up to date with \*(Aqorigin/master\*(Aq\&.
+Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&.
+  (use "git push" to publish your local commits)
 
 nothing to commit, working tree clean
 
@@ -635,10 +626,9 @@ While we wait for feedback, let\*(Aqs do something else\&.
 \fB$ git new\-branch chap2\fR
 
 \fB$ git map\-branches\fR
-\fBorigin/master
+\fBorigin/main
   chap2 *
-  fix_typo
-\fR  master
+\fR  fix_typo
 
 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR
 
@@ -648,7 +638,7 @@ when the fan was last cleaned\&.
 EOF
 \fB$ git status\fR
 On branch chap2
-Your branch is up to date with \*(Aqorigin/master\*(Aq\&.
+Your branch is up to date with \*(Aqorigin/main\*(Aq\&.
 
 Changes not staged for commit:
   (use "git add <file>\&.\&.\&." to update what will be committed)
@@ -672,20 +662,31 @@ Someone on the code review pointed out that our typo\-fix has a typo :( We\*(Aqr
 
 \fB$ git checkout fix_typo\fR
 Switched to branch \*(Aqfix_typo\*(Aq
-Your branch is up to date with \*(Aqorigin/master\*(Aq\&.
+Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&.
+  (use "git push" to publish your local commits)
 
 \fB$ echo \-e \*(Aq/Kuun\ens/Kuun/Kun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
-1772
-?
-?
-1772
+1501
+It was a Domo\-Kuun\&.
+It was a Domo\-Kun\&.
+1500
 \fB$ git upstream\-diff \-\-wordwise\fR
+\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt
+index 3eba355\&.\&.57cdcee 100644
+\-\-\- a/build/whitespace_file\&.txt
++++ b/build/whitespace_file\&.txt
+@@ \-17,7 +17,7 @@ swept up the streets (for it is in London that our scene lies), rattling along
+the housetops, and fiercely agitating the scanty flame of the lamps that
+struggled against the elements\&. A hooded figure emerged\&.
 
-\fB$ git commit \-am \*(AqFix typo for good!\*(Aq\fR
-On branch fix_typo
-Your branch is up to date with \*(Aqorigin/master\*(Aq\&.
+It was a Domo\-BananaKun\&.
 
-nothing to commit, working tree clean
+"What took you so long?", inquired his wife\&.
+
+\fR
+\fB$ git commit \-am \*(AqFix typo for good!\*(Aq\fR
+[fix_typo 2c0ad9c] Fix typo for good!
+ 1 file changed, 1 insertion(+), 1 deletion(\-)
 
 \fB$ git cl upload\fR
 \&.\&.\&. truncated output \&.\&.\&.
@@ -702,17 +703,11 @@ Since we got lgtm, let the CQ land it\&.
 .nf
 \fB$ git cl set_commit\fR
 \fB$ git map\fR
-* \fBa939958dff\fR	\fB(chap2\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed
-* \fB59cdb7335b\fR	\fB(HEAD \-> fix_typo\fR\fB, origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.    <(\fBchap2\fR)
-* \fB34676a3583\fR	2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
-* \fB7d4784e867\fR	2014\-04\-10 ~ Add best chapter2 ever!
-* \fB5d26fec369\fR	2014\-04\-10 ~ Finish chapter 2
-* \fBdf7fefbf06\fR	2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
-* \fB4b39cda0ac\fR	2014\-04\-10 ~ Fix terrible typo\&.
-* \fB248c5b6fe3\fR	2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
-* \fB8171df8af9\fR	2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
-* \fBd6a30d2e56\fR	2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
-* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBmaster\fR)
+* \fB0e2e52e72e\fR	\fB(chap2\fR\fB) \fR2014\-04\-10 ~ FREEZE\&.unindexed
+| * \fB2c0ad9c59b\fR	\fB(HEAD \-> fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good!
+| * \fB615ffa720f\fR	2014\-04\-10 ~ Fix terrible typo\&.
+|/
+* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBchap2\fR)
 * \fB41290e02b7\fR	2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7b7b\fR	2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a713b3\fR	2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
@@ -733,29 +728,43 @@ Switch back to where we were using the nav* commands (for fun\&.\&.\&. git check
 .\}
 .nf
 \fB$ git map\-branches\fR
-\fBorigin/master
-\fR  chap2
+origin/main
+  chap2
 \fB  fix_typo *
-\fR  master
-
+\fR
 \fB$ git nav\-upstream\fR
-HEAD is now at 59cdb73 Refactor data interchange format\&.
+Note: switching to \*(Aqorigin/main\*(Aq\&.
+
+You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch\&.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using \-c with the switch command\&. Example:
+
+  git switch \-c <new\-branch\-name>
+
+Or undo this operation with:
+
+  git switch \-
+
+Turn off this advice by setting config variable advice\&.detachedHead to false
+
+HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 
 \fB$ git nav\-downstream\fR
-Previous HEAD position was 59cdb73 Refactor data interchange format\&.
+Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 Switched to branch \*(Aqchap2\*(Aq
-Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
+Your branch is ahead of \*(Aqorigin/main\*(Aq by 1 commit\&.
   (use "git push" to publish your local commits)
 Please select a downstream branch
   0\&. chap2
   1\&. fix_typo
-  2\&. master
-Selection (0\-2)[0]: 0
+Selection (0\-1)[0]: 0
 \fB$ git map\-branches\fR
-origin/master
+origin/main
 \fB  chap2 *
 \fR  fix_typo
-  master
 
 .fi
 .if n \{\
@@ -771,55 +780,49 @@ Now we can pick up on chapter2 where we left off\&.
 \fB$ git thaw\fR
 
 \fB$ git diff\fR
-diff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt
-index 1293282\&.\&.0ae5a14 100644
+\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt
+index 3eba355\&.\&.9d08d9d 100644
 \-\-\- a/build/whitespace_file\&.txt
 +++ b/build/whitespace_file\&.txt
-@@ \-43,3 +43,7 @@ There was an poignant pause\&.
-
- CHAPTER 3:
- Hilariousness! This chapter is awesome!
+@@ \-34,3 +34,7 @@ with his fork, watching the runny jelly spread and pool across his plate,
+ like the blood of a dying fawn\&. \e"It reminds me of that time \-\-\e" he started, as
+ his wife cut in quickly: \e"\-\- please\&. I can\*(Aqt bear to hear it\&.\e"\&. A flury of
+ images coming from the past flowed through his mind\&.
 +
 +"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
 +overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about
 +when the fan was last cleaned\&.
-
+\fR
 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR
 
 There was an poignant pause\&.
 EOF
 \fB$ git diff\fR
-diff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt
-index 1293282\&.\&.a63d04e 100644
+\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt
+index 3eba355\&.\&.e3a55de 100644
 \-\-\- a/build/whitespace_file\&.txt
 +++ b/build/whitespace_file\&.txt
-@@ \-43,3 +43,9 @@ There was an poignant pause\&.
-
- CHAPTER 3:
- Hilariousness! This chapter is awesome!
+@@ \-34,3 +34,9 @@ with his fork, watching the runny jelly spread and pool across his plate,
+ like the blood of a dying fawn\&. \e"It reminds me of that time \-\-\e" he started, as
+ his wife cut in quickly: \e"\-\- please\&. I can\*(Aqt bear to hear it\&.\e"\&. A flury of
+ images coming from the past flowed through his mind\&.
 +
 +"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
 +overhead, barely disturbing the thick cigarette smoke\&. No doubt was left about
 +when the fan was last cleaned\&.
 +
 +There was an poignant pause\&.
-
+\fR
 \fB$ git commit \-am \*(AqFinish chapter 2\*(Aq\fR
-[chap2 d4a9451] Finish chapter 2
+[chap2 ceef712] Finish chapter 2
  1 file changed, 6 insertions(+)
 
 \fB$ git map\fR
-* \fBd4a945118e\fR	\fB(HEAD \-> chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
-* \fB59cdb7335b\fR	\fB(origin/master\fR\fB, origin/HEAD\fR\fB, fix_typo\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.    <(\fBfix_typo\fR)
-* \fB34676a3583\fR	2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
-* \fB7d4784e867\fR	2014\-04\-10 ~ Add best chapter2 ever!
-* \fB5d26fec369\fR	2014\-04\-10 ~ Finish chapter 2
-* \fBdf7fefbf06\fR	2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
-* \fB4b39cda0ac\fR	2014\-04\-10 ~ Fix terrible typo\&.
-* \fB248c5b6fe3\fR	2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
-* \fB8171df8af9\fR	2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
-* \fBd6a30d2e56\fR	2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
-* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBmaster\fR)
+* \fBceef712d7f\fR	\fB(HEAD \-> chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
+| * \fB2c0ad9c59b\fR	\fB(fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good!
+| * \fB615ffa720f\fR	2014\-04\-10 ~ Fix terrible typo\&.
+|/
+* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBfix_typo\fR)
 * \fB41290e02b7\fR	2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7b7b\fR	2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a713b3\fR	2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
@@ -862,22 +865,16 @@ Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun
 began feeling sick\&.
 EOF
 \fB$ git commit \-am \*(Aqbeginning of chapter 3\*(Aq\fR
-[chap3 d2902ef] beginning of chapter 3
+[chap3 7d4238a] beginning of chapter 3
  1 file changed, 4 insertions(+)
 
 \fB$ git map\fR
-* \fBd2902efc4d\fR	\fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
-* \fBd4a945118e\fR	\fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
-* \fB59cdb7335b\fR	\fB(origin/master\fR\fB, origin/HEAD\fR\fB, fix_typo\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.    <(\fBchap2, fix_typo\fR)
-* \fB34676a3583\fR	2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
-* \fB7d4784e867\fR	2014\-04\-10 ~ Add best chapter2 ever!
-* \fB5d26fec369\fR	2014\-04\-10 ~ Finish chapter 2
-* \fBdf7fefbf06\fR	2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
-* \fB4b39cda0ac\fR	2014\-04\-10 ~ Fix terrible typo\&.
-* \fB248c5b6fe3\fR	2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
-* \fB8171df8af9\fR	2014\-04\-10 ~ Remove AMD family check for the flapper crypto accelerator\&.
-* \fBd6a30d2e56\fR	2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
-* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, master\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBmaster\fR)
+* \fB7d4238a1e2\fR	\fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
+* \fBceef712d7f\fR	\fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
+| * \fB2c0ad9c59b\fR	\fB(fix_typo\fR\fB) \fR2014\-04\-10 ~ Fix typo for good!
+| * \fB615ffa720f\fR	2014\-04\-10 ~ Fix terrible typo\&.
+|/
+* \fBbeec6f4746\fR	\fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes    <(\fBfix_typo, chap2\fR)
 * \fB41290e02b7\fR	2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
 * \fBa76fde7b7b\fR	2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
 * \fB9de7a713b3\fR	2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.
@@ -900,12 +897,14 @@ We haven\*(Aqt updated the code in a while, so let\*(Aqs do that now\&.
 \fB$ git rebase\-update\fR
 Fetching origin
 From https://upstream
-\fBchap2\fR up\-to\-date
-\fBfix_typo\fR up\-to\-date
-Rebasing: \fBmaster\fR
-\fBchap3\fR up\-to\-date
-Deleted branch fix_typo (was 59cdb73)\&.
-Deleted branch master (was 59cdb73)\&.
+   beec6f4\&.\&.59cdb73  main       \-> origin/main
+Rebasing: \fBchap2\fR
+Rebasing: \fBfix_typo\fR
+Failed! Attempting to squash \fBfix_typo\fR \&.\&.\&. Success!
+Rebasing: \fBchap3\fR
+Reparented chap3 to track origin/main (was tracking chap2)
+Deleted branch fix_typo (was 5d26fec)\&.
+Deleted branch chap2 (was 5d26fec)\&.
 
 Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
 .fi
@@ -922,12 +921,8 @@ Well look at that\&. The CQ landed our typo and chapter2 branches already and gi
 \fB$ gclient sync\fR
 \&.\&.\&. truncated output \&.\&.\&.
 \fB$ git map\fR
-* \fBd2902efc4d\fR	\fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
-* \fBd4a945118e\fR	\fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
-* \fB59cdb7335b\fR	\fB(origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.    <(\fBchap2\fR)
-* \fB34676a3583\fR	2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
-* \fB7d4784e867\fR	2014\-04\-10 ~ Add best chapter2 ever!
-* \fB5d26fec369\fR	\fB(origin/main\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
+* \fB93fe917ad1\fR	\fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
+* \fB5d26fec369\fR	\fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
 * \fBdf7fefbf06\fR	2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
 * \fB4b39cda0ac\fR	2014\-04\-10 ~ Fix terrible typo\&.
 * \fB248c5b6fe3\fR	2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.
@@ -956,10 +951,25 @@ Someone on IRC mentions that they actually landed a chapter 3 already! We should
 \fB$ git rebase\-update\fR
 Fetching origin
 From https://upstream
+   5d26fec\&.\&.59cdb73  main       \-> origin/main
 Rebasing: chap2
 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.
 \fB$ git diff\fR
+\fBdiff \-\-cc build/whitespace_file\&.txt
+index 1293282,f903ea2\&.\&.0000000
+\-\-\- a/build/whitespace_file\&.txt
++++ b/build/whitespace_file\&.txt
+@@@ \-42,4 \-42,5 +42,9 @@@ when the fan was last cleaned
+  There was an poignant pause\&.
 
+  CHAPTER 3:
+++<<<<<<< HEAD
+ +Hilariousness! This chapter is awesome!
+++=======
++ Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he
++ began feeling sick\&.
+++>>>>>>> 93fe917 (beginning of chapter 3)
+\fR
 .fi
 .if n \{\
 .RE
@@ -976,7 +986,18 @@ Oh, well, that\*(Aqs not too bad\&. In fact\&.\&.\&. that\*(Aqs a terrible chapt
 \fB$ git add build/whitespace_file\&.txt\fR
 
 \fB$ git diff \-\-cached\fR
+\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt
+index 1293282\&.\&.f903ea2 100644
+\-\-\- a/build/whitespace_file\&.txt
++++ b/build/whitespace_file\&.txt
+@@ \-42,4 +42,5 @@ when the fan was last cleaned\&.
+ There was an poignant pause\&.
 
+ CHAPTER 3:
+\-Hilariousness! This chapter is awesome!
++Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he
++began feeling sick\&.
+\fR
 .fi
 .if n \{\
 .RE
@@ -989,10 +1010,11 @@ Much better
 .\}
 .nf
 \fB$ git rebase \-\-continue\fR
+[detached HEAD 1cb4f5b] beginning of chapter 3
+ 1 file changed, 2 insertions(+), 1 deletion(\-)
 
 \fB$ git rebase\-update\fR
 Fetching origin
-\fBchap2\fR up\-to\-date
 \fBchap3\fR up\-to\-date
 
 Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
@@ -1000,12 +1022,11 @@ Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
 \fB$ gclient sync\fR
 \&.\&.\&. truncated output \&.\&.\&.
 \fB$ git map\fR
-* \fBd2902efc4d\fR	\fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
-* \fBd4a945118e\fR	\fB(chap2\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
-* \fB59cdb7335b\fR	\fB(origin/master\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.    <(\fBchap2\fR)
+* \fB1cb4f5b622\fR	\fB(HEAD \-> chap3\fR\fB) \fR2014\-04\-10 ~ beginning of chapter 3
+* \fB59cdb7335b\fR	\fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Refactor data interchange format\&.
 * \fB34676a3583\fR	2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-page navigations\&.
 * \fB7d4784e867\fR	2014\-04\-10 ~ Add best chapter2 ever!
-* \fB5d26fec369\fR	\fB(origin/main\fR\fB) \fR2014\-04\-10 ~ Finish chapter 2
+* \fB5d26fec369\fR	2014\-04\-10 ~ Finish chapter 2
 * \fBdf7fefbf06\fR	2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
 * \fB4b39cda0ac\fR	2014\-04\-10 ~ Fix terrible typo\&.
 * \fB248c5b6fe3\fR	2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup\&.

man/src/depot_tools_tutorial.txt

@@ -124,8 +124,8 @@ code, including msysgit and python.
 * If you see strange errors with the file system on the first run of gclient,
   you may want to link:http://tortoisesvn.tigris.org/faq.html#cantmove2[disable
   Windows Indexing].
-* After running gclient open a command prompt and type `where python` and confirm that
-  the depot_tools python.bat comes ahead of any copies of python.exe. Failing to ensure
+* After running gclient open a command prompt and type `where python3` and confirm that
+  the depot_tools python3.bat comes ahead of any copies of python3.exe. Failing to ensure
   this can lead to overbuilding when using gn - see
   link:https://issues.chromium.org/issues/41253477[crbug.com/41253477].
 =====