Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
FangSoftSoft
/
depot_tools
-ын хуулбар https://chromium.googlesource.com/chromium/tools/depot_tools.git/
2
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Use py3 in documentation generation

This change also updates version of git documentation to match one used in
depot_tools, asciidoc, and ansi2html. It also fixes reset signal.

R=gavinmak@google.com

Bug: 1357152
Change-Id: I998e7434dde8d82b491376b47a5993c6d91d64a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3856830
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Josip Sokcevic 3 жил өмнө
parent
3528d4d3c5
commit
8d2f774038
51 өөрчлөгдсөн 642 нэмэгдсэн , 2151 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 2 11
      man/html/depot_tools.html
  2. 197 167
      man/html/depot_tools_tutorial.html
  3. 2 2
      man/html/git-cl.html
  4. 0 1050
      man/html/git-drover.html
  5. 11 7
      man/html/git-footers.html
  6. 33 28
      man/html/git-freeze.html
  7. 4 4
      man/html/git-hyper-blame.html
  8. 20 18
      man/html/git-map-branches.html
  9. 23 23
      man/html/git-map.html
  10. 2 2
      man/html/git-mark-merge-base.html
  11. 26 22
      man/html/git-nav-downstream.html
  12. 27 22
      man/html/git-nav-upstream.html
  13. 68 56
      man/html/git-new-branch.html
  14. 2 2
      man/html/git-rebase-update.html
  15. 2 2
      man/html/git-rename-branch.html
  16. 2 2
      man/html/git-reparent-branch.html
  17. 2 2
      man/html/git-retry.html
  18. 45 44
      man/html/git-squash-branch.html
  19. 2 2
      man/html/git-thaw.html
  20. 2 2
      man/html/git-upstream-diff.html
  21. 3 3
      man/man1/git-cl.1
  22. 0 330
      man/man1/git-drover.1
  23. 7 3
      man/man1/git-footers.1
  24. 10 5
      man/man1/git-freeze.1
  25. 3 3
      man/man1/git-hyper-blame.1
  26. 7 5
      man/man1/git-map-branches.1
  27. 3 3
      man/man1/git-map.1
  28. 3 3
      man/man1/git-mark-merge-base.1
  29. 6 3
      man/man1/git-nav-downstream.1
  30. 7 3
      man/man1/git-nav-upstream.1
  31. 17 6
      man/man1/git-new-branch.1
  32. 3 3
      man/man1/git-rebase-update.1
  33. 3 3
      man/man1/git-rename-branch.1
  34. 3 3
      man/man1/git-reparent-branch.1
  35. 3 3
      man/man1/git-retry.1
  36. 4 3
      man/man1/git-squash-branch.1
  37. 3 3
      man/man1/git-thaw.1
  38. 3 3
      man/man1/git-upstream-diff.1
  39. 3 8
      man/man7/depot_tools.7
  40. 54 24
      man/man7/depot_tools_tutorial.7
  41. 0 2
      man/src/_git-drover_desc.helper.txt
  42. 5 6
      man/src/common_demo_functions.sh
  43. 1 1
      man/src/depot_tools_tutorial.demo.walkthrough.sh
  44. 5 11
      man/src/filter_demo_output.py
  45. 0 22
      man/src/git-drover.demo.1.sh
  46. 0 23
      man/src/git-drover.demo.2.sh
  47. 0 27
      man/src/git-drover.demo.3.sh
  48. 0 39
      man/src/git-drover.demo.4.sh
  49. 0 19
      man/src/git-drover.demo.common.sh
  50. 0 102
      man/src/git-drover.txt
  51. 14 11
      man/src/make_docs.sh

+ 2 - 11
man/html/depot_tools.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>depot_tools(7)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -780,15 +780,6 @@ Interact with code reviews on Gerrit and Rietveld
 
 </p>
 
 </dd>
 
 <dt class="hdlist1">
 
-<a href="git-drover.html">git-drover(1)</a>
 
-</dt>
 
-<dd>
 
-<p>
 
-Apply a commit from the trunk to a release branch, or from one release branch to
 
-another.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
 <a href="git-footers.html">git-footers(1)</a>
 
 </dt>
 
 <dd>
 
@@ -929,7 +920,7 @@ Print a diff of the current branch, compared to its upstream.
 
 <div id="footer">
 
 <div id="footer-text">
 
 Last updated
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 197 - 167
man/html/depot_tools_tutorial.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>depot_tools_tutorial(7)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -1232,108 +1232,121 @@ or vice versa.</p></div>
 
 <div class="sectionbody">
 
 <div class="paragraph"><p>This section will demo what a typical workflow looks like when writing,
 
 updating, and committing multiple CLs.</p></div>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ fetch chromium</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ fetch chromium</span>
 
 ... truncated output ...
 
-<span style="font-weight: bold; color: #ffffff">$ cd src</span>
 
-</code></pre></div></div><p><div class="paragraph"> (only on linux)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ ./build/install-build-deps.sh</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ cd src</span>
 
+</code></pre></div></div><p><div class="paragraph"> (only on linux)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ ./build/install-build-deps.sh</span>
 
 ... truncated output ...
 
-</code></pre></div></div><p><div class="paragraph"> Pull in all dependencies for HEAD</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
 
+</code></pre></div></div><p><div class="paragraph"> Pull in all dependencies for HEAD</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ gclient sync</span>
 
 ... truncated output ...
 
-</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: #ffffff">$ git new-branch fix_typo</span>
 
-<span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt</span>
 
+</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>
 
 1503
 
 It was a Domo-Banana.
 
 It was a Domo-Kuun.
 
 1501
 
-<span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible typo.'</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'Fix terrible typo.'</span>
 
 [fix_typo 615ffa7] Fix terrible typo.
 
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-<span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-<span style="font-weight: bold; color: #ffffff">$ git status</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map</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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git status</span>
 
 On branch fix_typo
 
 Your branch is ahead of 'origin/main' by 1 commit.
 
   (use "git push" to publish your local commits)
 
 
 nothing to commit, working tree clean
 
-<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git cl upload -r domo@chromium.org --send-mail</span>
 
 ... truncated output ...
 
-</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: #ffffff">$ git new-branch chap2</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
 
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  chap2 *
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fix_typo
 
-</span><span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whitespace_file.txt &lt;&lt;EOF</span>
 
+</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/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: #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>
 
 
 "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.
 
 EOF
 
-<span style="font-weight: bold; color: #ffffff">$ git status</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git status</span>
 
 On branch chap2
 
 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)
 
   (use "git restore &lt;file&gt;..." to discard changes in working directory)
 
-	<span style="color: #e42e16">modified:   build/whitespace_file.txt</span>
 
+	<span style="color: #FF5555">modified:   build/whitespace_file.txt</span>
 
 
 no changes added to commit (use "git add" and/or "git commit -a")
 
-</code></pre></div></div><p><div class="paragraph"> Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git freeze</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span>
 
+
 
+</code></pre></div></div><p><div class="paragraph"> Someone on the code review pointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git freeze</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git checkout fix_typo</span>
 
 Switched to branch 'fix_typo'
 
 Your branch is ahead of 'origin/main' by 1 commit.
 
   (use "git push" to publish your local commits)
 
-<span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt</span>
 
 1501
 
 It was a Domo-Kuun.
 
 It was a Domo-Kun.
 
 1500
 
-<span style="font-weight: bold; color: #ffffff">$ git upstream-diff --wordwise</span>
 
+<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: #33d6e5">@@ -17,7 +17,7 @@</span> swept up the streets (for it is in London that our scene lies), rattling along
 
+<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.
 
 
-It was a Domo-<span style="color: #e42e16">Banana</span><span style="color: #19c518">Kun</span>.
 
+It was a Domo-<span style="color: #FF5555">Banana</span><span style="color: #50FA7B">Kun</span>.
 
 
 "What took you so long?", inquired his wife.
 
 
-<span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix typo for good!'</span>
 
+
 
+<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: #ffffff">$ git cl upload</span>
 
+
 
+<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: #ffffff">$ git cl set_commit</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">0e2e52e72e</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
 
-<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-</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: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  chap2
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  fix_typo *
 
-</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
 
+</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">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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+</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="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: #BFBFBF">$ git nav-upstream</span>
 
 Note: switching to 'origin/main'.
 
 
 You are in 'detached HEAD' state. You can look around, make experimental
 
@@ -1352,7 +1365,8 @@ Or undo this operation with:
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
 
 HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 
-<span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git nav-downstream</span>
 
 Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 
 Switched to branch 'chap2'
 
 Your branch is ahead of 'origin/main' by 1 commit.
 
@@ -1361,87 +1375,96 @@ Please select a downstream branch
 
   0. chap2
 
   1. fix_typo
 
 Selection (0-1)[0]: 0
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  chap2 *
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fix_typo
 
-</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><span style="font-weight: bold; color: #ffffff">$ git thaw</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git diff</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
 
+<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>
 
+</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>
 
 <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: #33d6e5">@@ -34,3 +34,7 @@</span> with his fork, watching the runny jelly spread and pool across his plate,
 
+<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: #19c518">+</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">overhead, barely disturbing the thick cigarette smoke. No doubt was left about</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">when the fan was last cleaned.</span>
 
-<span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whitespace_file.txt &lt;&lt;EOF</span>
 
+<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: #ffffff">$ git diff</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git diff</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..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: #33d6e5">@@ -34,3 +34,9 @@</span> with his fork, watching the runny jelly spread and pool across his plate,
 
+<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: #19c518">+</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">overhead, barely disturbing the thick cigarette smoke. No doubt was left about</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">when the fan was last cleaned.</span>
 
-<span style="color: #19c518">+</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">There was an poignant pause.</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git commit -am 'Finish chapter 2'</span>
 
+<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 ceef712] Finish chapter 2
 
  1 file changed, 6 insertions(+)
 
-<span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ceef712d7f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
 
-<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map</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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git cl upload -r domo@chromium.org --send-mail</span>
 
 ... truncated output ...
 
-</code></pre></div></div><p><div class="paragraph"> We poke a committer until they lgtm :)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cl set_commit</span>
 
-</code></pre></div></div><p><div class="paragraph"> While that runs through the CQ, let's get started on chapter 3. Since we know that chapter 3 depends on chapter 2, we'll track the current chapter2 branch.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current chap3</span>
 
-<span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whitespace_file.txt &lt;&lt;EOF</span>
 
+</code></pre></div></div><p><div class="paragraph"> We poke a committer until they lgtm :)</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git cl set_commit</span>
 
+</code></pre></div></div><p><div class="paragraph"> While that runs through the CQ, let's get started on chapter 3. Since we know that chapter 3 depends on chapter 2, we'll track the current chapter2 branch.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git new-branch --upstream_current chap3</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ cat &gt;&gt; build/whitespace_file.txt &lt;&lt;EOF</span>
 
 
 CHAPTER 3:
 
 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: #ffffff">$ git commit -am 'beginning of chapter 3'</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git commit -am 'beginning of chapter 3'</span>
 
 [chap3 7d4238a] beginning of chapter 3
 
  1 file changed, 4 insertions(+)
 
-<span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d4238a1e2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ceef712d7f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2c0ad9c59b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">615ffa720f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
 
-<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">chap2, fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-</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: #ffffff">$ git rebase-update</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map</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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+</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
 
    beec6f4..59cdb73  main       -&gt; origin/main
 
@@ -1454,90 +1477,97 @@ 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: #ffffff">$ gclient sync</span>
 
+</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: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">93fe917ad1</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-</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: #ffffff">$ git rebase-update</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map</span>
 
+* <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.
 
+* <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: #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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+</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: #ffffff">$ git diff</span>
 
+<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: #33d6e5">@@@ -42,4 -42,5 +42,9 @@@</span> when the fan was last cleaned
 
+<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: #19c518">++&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</span>
 
-<span style="color: #19c518"> +Hilariousness! This chapter is awesome!</span>
 
-<span style="color: #19c518">++=======</span>
 
-<span style="color: #19c518">+ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
 
-<span style="color: #19c518">+ began feeling sick.</span>
 
-<span style="color: #19c518">++&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: #ffffff">$ $EDITOR build/whitespace_file.txt</span>
 
+<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: #ffffff">$ git add build/whitespace_file.txt</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git diff --cached</span>
 
+<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: #33d6e5">@@ -42,4 +42,5 @@</span> when the fan was last cleaned.
 
+<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: #e42e16">-Hilariousness! This chapter is awesome!</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
 
-<span style="color: #19c518">+</span><span style="color: #19c518">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: #ffffff">$ git rebase --continue</span>
 
+<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: #ffffff">$ git rebase-update</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git rebase-update</span>
 
 Fetching origin
 
 chap3 up-to-date
 
 
 Running `git gc --auto` - Ctrl-C to abort is OK.
 
-<span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ gclient sync</span>
 
 ... truncated output ...
 
-<span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">1cb4f5b622</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; chap3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">59cdb7335b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor data interchange format.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">34676a3583</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d4784e867</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Add best chapter2 ever!
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">5d26fec369</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">df7fefbf06</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4b39cda0ac</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">248c5b6fe3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Temporarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">8171df8af9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Remove AMD family check for the flapper crypto accelerator.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d6a30d2e56</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Change the Pica load benchmark to listen for the polymer-ready event
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map</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: #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: #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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git cl upload</span>
 
 ... truncated output ...
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 <div class="paragraph"><p>So there you have the basic flow. Note that you don&#8217;t <em>have</em> to do chromium
 
@@ -1602,7 +1632,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 
 <div id="footer">
 
 <div id="footer-text">
 
 Last updated
 
- 2021-07-01 07:12:07 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-cl.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-cl(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -1028,7 +1028,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 
 <div id="footer">
 
 <div id="footer-text">
 
 Last updated
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-30 07:25:33 PDT
 
 </div>
 
 </div>
 
 </body>

+ 0 - 1050
man/html/git-drover.html
Файл харах 

@@ -1,1050 +0,0 @@
 
-<?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
-<head>
 
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
-<title>git-drover(1)</title>
 
-<style type="text/css">
 
-/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
-
 
-/* Default font. */
 
-body {
 
-  font-family: Georgia,serif;
 
-}
 
-
 
-/* Title font. */
 
-h1, h2, h3, h4, h5, h6,
 
-div.title, caption.title,
 
-thead, p.table.header,
 
-#toctitle,
 
-#author, #revnumber, #revdate, #revremark,
 
-#footer {
 
-  font-family: Arial,Helvetica,sans-serif;
 
-}
 
-
 
-body {
 
-  margin: 1em 5% 1em 5%;
 
-}
 
-
 
-a {
 
-  color: blue;
 
-  text-decoration: underline;
 
-}
 
-a:visited {
 
-  color: fuchsia;
 
-}
 
-
 
-em {
 
-  font-style: italic;
 
-  color: navy;
 
-}
 
-
 
-strong {
 
-  font-weight: bold;
 
-  color: #083194;
 
-}
 
-
 
-h1, h2, h3, h4, h5, h6 {
 
-  color: #527bbd;
 
-  margin-top: 1.2em;
 
-  margin-bottom: 0.5em;
 
-  line-height: 1.3;
 
-}
 
-
 
-h1, h2, h3 {
 
-  border-bottom: 2px solid silver;
 
-}
 
-h2 {
 
-  padding-top: 0.5em;
 
-}
 
-h3 {
 
-  float: left;
 
-}
 
-h3 + * {
 
-  clear: left;
 
-}
 
-h5 {
 
-  font-size: 1.0em;
 
-}
 
-
 
-div.sectionbody {
 
-  margin-left: 0;
 
-}
 
-
 
-hr {
 
-  border: 1px solid silver;
 
-}
 
-
 
-p {
 
-  margin-top: 0.5em;
 
-  margin-bottom: 0.5em;
 
-}
 
-
 
-ul, ol, li > p {
 
-  margin-top: 0;
 
-}
 
-ul > li     { color: #aaa; }
 
-ul > li > * { color: black; }
 
-
 
-.monospaced, code, pre {
 
-  font-family: "Courier New", Courier, monospace;
 
-  font-size: inherit;
 
-  color: navy;
 
-  padding: 0;
 
-  margin: 0;
 
-}
 
-pre {
 
-  white-space: pre-wrap;
 
-}
 
-
 
-#author {
 
-  color: #527bbd;
 
-  font-weight: bold;
 
-  font-size: 1.1em;
 
-}
 
-#email {
 
-}
 
-#revnumber, #revdate, #revremark {
 
-}
 
-
 
-#footer {
 
-  font-size: small;
 
-  border-top: 2px solid silver;
 
-  padding-top: 0.5em;
 
-  margin-top: 4.0em;
 
-}
 
-#footer-text {
 
-  float: left;
 
-  padding-bottom: 0.5em;
 
-}
 
-#footer-badges {
 
-  float: right;
 
-  padding-bottom: 0.5em;
 
-}
 
-
 
-#preamble {
 
-  margin-top: 1.5em;
 
-  margin-bottom: 1.5em;
 
-}
 
-div.imageblock, div.exampleblock, div.verseblock,
 
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 
-div.admonitionblock {
 
-  margin-top: 1.0em;
 
-  margin-bottom: 1.5em;
 
-}
 
-div.admonitionblock {
 
-  margin-top: 2.0em;
 
-  margin-bottom: 2.0em;
 
-  margin-right: 10%;
 
-  color: #606060;
 
-}
 
-
 
-div.content { /* Block element content. */
 
-  padding: 0;
 
-}
 
-
 
-/* Block element titles. */
 
-div.title, caption.title {
 
-  color: #527bbd;
 
-  font-weight: bold;
 
-  text-align: left;
 
-  margin-top: 1.0em;
 
-  margin-bottom: 0.5em;
 
-}
 
-div.title + * {
 
-  margin-top: 0;
 
-}
 
-
 
-td div.title:first-child {
 
-  margin-top: 0.0em;
 
-}
 
-div.content div.title:first-child {
 
-  margin-top: 0.0em;
 
-}
 
-div.content + div.title {
 
-  margin-top: 0.0em;
 
-}
 
-
 
-div.sidebarblock > div.content {
 
-  background: #ffffee;
 
-  border: 1px solid #dddddd;
 
-  border-left: 4px solid #f0f0f0;
 
-  padding: 0.5em;
 
-}
 
-
 
-div.listingblock > div.content {
 
-  border: 1px solid #dddddd;
 
-  border-left: 5px solid #f0f0f0;
 
-  background: #f8f8f8;
 
-  padding: 0.5em;
 
-}
 
-
 
-div.quoteblock, div.verseblock {
 
-  padding-left: 1.0em;
 
-  margin-left: 1.0em;
 
-  margin-right: 10%;
 
-  border-left: 5px solid #f0f0f0;
 
-  color: #888;
 
-}
 
-
 
-div.quoteblock > div.attribution {
 
-  padding-top: 0.5em;
 
-  text-align: right;
 
-}
 
-
 
-div.verseblock > pre.content {
 
-  font-family: inherit;
 
-  font-size: inherit;
 
-}
 
-div.verseblock > div.attribution {
 
-  padding-top: 0.75em;
 
-  text-align: left;
 
-}
 
-/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 
-div.verseblock + div.attribution {
 
-  text-align: left;
 
-}
 
-
 
-div.admonitionblock .icon {
 
-  vertical-align: top;
 
-  font-size: 1.1em;
 
-  font-weight: bold;
 
-  text-decoration: underline;
 
-  color: #527bbd;
 
-  padding-right: 0.5em;
 
-}
 
-div.admonitionblock td.content {
 
-  padding-left: 0.5em;
 
-  border-left: 3px solid #dddddd;
 
-}
 
-
 
-div.exampleblock > div.content {
 
-  border-left: 3px solid #dddddd;
 
-  padding-left: 0.5em;
 
-}
 
-
 
-div.imageblock div.content { padding-left: 0; }
 
-span.image img { border-style: none; vertical-align: text-bottom; }
 
-a.image:visited { color: white; }
 
-
 
-dl {
 
-  margin-top: 0.8em;
 
-  margin-bottom: 0.8em;
 
-}
 
-dt {
 
-  margin-top: 0.5em;
 
-  margin-bottom: 0;
 
-  font-style: normal;
 
-  color: navy;
 
-}
 
-dd > *:first-child {
 
-  margin-top: 0.1em;
 
-}
 
-
 
-ul, ol {
 
-    list-style-position: outside;
 
-}
 
-ol.arabic {
 
-  list-style-type: decimal;
 
-}
 
-ol.loweralpha {
 
-  list-style-type: lower-alpha;
 
-}
 
-ol.upperalpha {
 
-  list-style-type: upper-alpha;
 
-}
 
-ol.lowerroman {
 
-  list-style-type: lower-roman;
 
-}
 
-ol.upperroman {
 
-  list-style-type: upper-roman;
 
-}
 
-
 
-div.compact ul, div.compact ol,
 
-div.compact p, div.compact p,
 
-div.compact div, div.compact div {
 
-  margin-top: 0.1em;
 
-  margin-bottom: 0.1em;
 
-}
 
-
 
-tfoot {
 
-  font-weight: bold;
 
-}
 
-td > div.verse {
 
-  white-space: pre;
 
-}
 
-
 
-div.hdlist {
 
-  margin-top: 0.8em;
 
-  margin-bottom: 0.8em;
 
-}
 
-div.hdlist tr {
 
-  padding-bottom: 15px;
 
-}
 
-dt.hdlist1.strong, td.hdlist1.strong {
 
-  font-weight: bold;
 
-}
 
-td.hdlist1 {
 
-  vertical-align: top;
 
-  font-style: normal;
 
-  padding-right: 0.8em;
 
-  color: navy;
 
-}
 
-td.hdlist2 {
 
-  vertical-align: top;
 
-}
 
-div.hdlist.compact tr {
 
-  margin: 0;
 
-  padding-bottom: 0;
 
-}
 
-
 
-.comment {
 
-  background: yellow;
 
-}
 
-
 
-.footnote, .footnoteref {
 
-  font-size: 0.8em;
 
-}
 
-
 
-span.footnote, span.footnoteref {
 
-  vertical-align: super;
 
-}
 
-
 
-#footnotes {
 
-  margin: 20px 0 20px 0;
 
-  padding: 7px 0 0 0;
 
-}
 
-
 
-#footnotes div.footnote {
 
-  margin: 0 0 5px 0;
 
-}
 
-
 
-#footnotes hr {
 
-  border: none;
 
-  border-top: 1px solid silver;
 
-  height: 1px;
 
-  text-align: left;
 
-  margin-left: 0;
 
-  width: 20%;
 
-  min-width: 100px;
 
-}
 
-
 
-div.colist td {
 
-  padding-right: 0.5em;
 
-  padding-bottom: 0.3em;
 
-  vertical-align: top;
 
-}
 
-div.colist td img {
 
-  margin-top: 0.3em;
 
-}
 
-
 
-@media print {
 
-  #footer-badges { display: none; }
 
-}
 
-
 
-#toc {
 
-  margin-bottom: 2.5em;
 
-}
 
-
 
-#toctitle {
 
-  color: #527bbd;
 
-  font-size: 1.1em;
 
-  font-weight: bold;
 
-  margin-top: 1.0em;
 
-  margin-bottom: 0.1em;
 
-}
 
-
 
-div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 
-  margin-top: 0;
 
-  margin-bottom: 0;
 
-}
 
-div.toclevel2 {
 
-  margin-left: 2em;
 
-  font-size: 0.9em;
 
-}
 
-div.toclevel3 {
 
-  margin-left: 4em;
 
-  font-size: 0.9em;
 
-}
 
-div.toclevel4 {
 
-  margin-left: 6em;
 
-  font-size: 0.9em;
 
-}
 
-
 
-span.aqua { color: aqua; }
 
-span.black { color: black; }
 
-span.blue { color: blue; }
 
-span.fuchsia { color: fuchsia; }
 
-span.gray { color: gray; }
 
-span.green { color: green; }
 
-span.lime { color: lime; }
 
-span.maroon { color: maroon; }
 
-span.navy { color: navy; }
 
-span.olive { color: olive; }
 
-span.purple { color: purple; }
 
-span.red { color: red; }
 
-span.silver { color: silver; }
 
-span.teal { color: teal; }
 
-span.white { color: white; }
 
-span.yellow { color: yellow; }
 
-
 
-span.aqua-background { background: aqua; }
 
-span.black-background { background: black; }
 
-span.blue-background { background: blue; }
 
-span.fuchsia-background { background: fuchsia; }
 
-span.gray-background { background: gray; }
 
-span.green-background { background: green; }
 
-span.lime-background { background: lime; }
 
-span.maroon-background { background: maroon; }
 
-span.navy-background { background: navy; }
 
-span.olive-background { background: olive; }
 
-span.purple-background { background: purple; }
 
-span.red-background { background: red; }
 
-span.silver-background { background: silver; }
 
-span.teal-background { background: teal; }
 
-span.white-background { background: white; }
 
-span.yellow-background { background: yellow; }
 
-
 
-span.big { font-size: 2em; }
 
-span.small { font-size: 0.6em; }
 
-
 
-span.underline { text-decoration: underline; }
 
-span.overline { text-decoration: overline; }
 
-span.line-through { text-decoration: line-through; }
 
-
 
-div.unbreakable { page-break-inside: avoid; }
 
-
 
-
 
-/*
 
- * xhtml11 specific
 
- *
 
- * */
 
-
 
-div.tableblock {
 
-  margin-top: 1.0em;
 
-  margin-bottom: 1.5em;
 
-}
 
-div.tableblock > table {
 
-  border: 3px solid #527bbd;
 
-}
 
-thead, p.table.header {
 
-  font-weight: bold;
 
-  color: #527bbd;
 
-}
 
-p.table {
 
-  margin-top: 0;
 
-}
 
-/* Because the table frame attribute is overridden by CSS in most browsers. */
 
-div.tableblock > table[frame="void"] {
 
-  border-style: none;
 
-}
 
-div.tableblock > table[frame="hsides"] {
 
-  border-left-style: none;
 
-  border-right-style: none;
 
-}
 
-div.tableblock > table[frame="vsides"] {
 
-  border-top-style: none;
 
-  border-bottom-style: none;
 
-}
 
-
 
-
 
-/*
 
- * html5 specific
 
- *
 
- * */
 
-
 
-table.tableblock {
 
-  margin-top: 1.0em;
 
-  margin-bottom: 1.5em;
 
-}
 
-thead, p.tableblock.header {
 
-  font-weight: bold;
 
-  color: #527bbd;
 
-}
 
-p.tableblock {
 
-  margin-top: 0;
 
-}
 
-table.tableblock {
 
-  border-width: 3px;
 
-  border-spacing: 0px;
 
-  border-style: solid;
 
-  border-color: #527bbd;
 
-  border-collapse: collapse;
 
-}
 
-th.tableblock, td.tableblock {
 
-  border-width: 1px;
 
-  padding: 4px;
 
-  border-style: solid;
 
-  border-color: #527bbd;
 
-}
 
-
 
-table.tableblock.frame-topbot {
 
-  border-left-style: hidden;
 
-  border-right-style: hidden;
 
-}
 
-table.tableblock.frame-sides {
 
-  border-top-style: hidden;
 
-  border-bottom-style: hidden;
 
-}
 
-table.tableblock.frame-none {
 
-  border-style: hidden;
 
-}
 
-
 
-th.tableblock.halign-left, td.tableblock.halign-left {
 
-  text-align: left;
 
-}
 
-th.tableblock.halign-center, td.tableblock.halign-center {
 
-  text-align: center;
 
-}
 
-th.tableblock.halign-right, td.tableblock.halign-right {
 
-  text-align: right;
 
-}
 
-
 
-th.tableblock.valign-top, td.tableblock.valign-top {
 
-  vertical-align: top;
 
-}
 
-th.tableblock.valign-middle, td.tableblock.valign-middle {
 
-  vertical-align: middle;
 
-}
 
-th.tableblock.valign-bottom, td.tableblock.valign-bottom {
 
-  vertical-align: bottom;
 
-}
 
-
 
-
 
-/*
 
- * manpage specific
 
- *
 
- * */
 
-
 
-body.manpage h1 {
 
-  padding-top: 0.5em;
 
-  padding-bottom: 0.5em;
 
-  border-top: 2px solid silver;
 
-  border-bottom: 2px solid silver;
 
-}
 
-body.manpage h2 {
 
-  border-style: none;
 
-}
 
-body.manpage div.sectionbody {
 
-  margin-left: 3em;
 
-}
 
-
 
-@media print {
 
-  body.manpage div#toc { display: none; }
 
-}
 
-
 
-
 
-div.listingblock > div.content {
 
-  background: rgb(28, 28, 28);
 
-}
 
-
 
-div.listingblock > div > pre > code {
 
-  color: rgb(187, 187, 187);
 
-}
 
-</style>
 
-<script type="text/javascript">
 
-/*<![CDATA[*/
 
-var asciidoc = {  // Namespace.
 
-
 
-/////////////////////////////////////////////////////////////////////
 
-// Table Of Contents generator
 
-/////////////////////////////////////////////////////////////////////
 
-
 
-/* Author: Mihai Bazon, September 2002
 
- * http://students.infoiasi.ro/~mishoo
 
- *
 
- * Table Of Content generator
 
- * Version: 0.4
 
- *
 
- * Feel free to use this script under the terms of the GNU General Public
 
- * License, as long as you do not remove or alter this notice.
 
- */
 
-
 
- /* modified by Troy D. Hanson, September 2006. License: GPL */
 
- /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 
-
 
-// toclevels = 1..4.
 
-toc: function (toclevels) {
 
-
 
-  function getText(el) {
 
-    var text = "";
 
-    for (var i = el.firstChild; i != null; i = i.nextSibling) {
 
-      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 
-        text += i.data;
 
-      else if (i.firstChild != null)
 
-        text += getText(i);
 
-    }
 
-    return text;
 
-  }
 
-
 
-  function TocEntry(el, text, toclevel) {
 
-    this.element = el;
 
-    this.text = text;
 
-    this.toclevel = toclevel;
 
-  }
 
-
 
-  function tocEntries(el, toclevels) {
 
-    var result = new Array;
 
-    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
 
-    // Function that scans the DOM tree for header elements (the DOM2
 
-    // nodeIterator API would be a better technique but not supported by all
 
-    // browsers).
 
-    var iterate = function (el) {
 
-      for (var i = el.firstChild; i != null; i = i.nextSibling) {
 
-        if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
 
-          var mo = re.exec(i.tagName);
 
-          if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
 
-            result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
 
-          }
 
-          iterate(i);
 
-        }
 
-      }
 
-    }
 
-    iterate(el);
 
-    return result;
 
-  }
 
-
 
-  var toc = document.getElementById("toc");
 
-  if (!toc) {
 
-    return;
 
-  }
 
-
 
-  // Delete existing TOC entries in case we're reloading the TOC.
 
-  var tocEntriesToRemove = [];
 
-  var i;
 
-  for (i = 0; i < toc.childNodes.length; i++) {
 
-    var entry = toc.childNodes[i];
 
-    if (entry.nodeName.toLowerCase() == 'div'
 
-     && entry.getAttribute("class")
 
-     && entry.getAttribute("class").match(/^toclevel/))
 
-      tocEntriesToRemove.push(entry);
 
-  }
 
-  for (i = 0; i < tocEntriesToRemove.length; i++) {
 
-    toc.removeChild(tocEntriesToRemove[i]);
 
-  }
 
-
 
-  // Rebuild TOC entries.
 
-  var entries = tocEntries(document.getElementById("content"), toclevels);
 
-  for (var i = 0; i < entries.length; ++i) {
 
-    var entry = entries[i];
 
-    if (entry.element.id == "")
 
-      entry.element.id = "_toc_" + i;
 
-    var a = document.createElement("a");
 
-    a.href = "#" + entry.element.id;
 
-    a.appendChild(document.createTextNode(entry.text));
 
-    var div = document.createElement("div");
 
-    div.appendChild(a);
 
-    div.className = "toclevel" + entry.toclevel;
 
-    toc.appendChild(div);
 
-  }
 
-  if (entries.length == 0)
 
-    toc.parentNode.removeChild(toc);
 
-},
 
-
 
-
 
-/////////////////////////////////////////////////////////////////////
 
-// Footnotes generator
 
-/////////////////////////////////////////////////////////////////////
 
-
 
-/* Based on footnote generation code from:
 
- * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 
- */
 
-
 
-footnotes: function () {
 
-  // Delete existing footnote entries in case we're reloading the footnodes.
 
-  var i;
 
-  var noteholder = document.getElementById("footnotes");
 
-  if (!noteholder) {
 
-    return;
 
-  }
 
-  var entriesToRemove = [];
 
-  for (i = 0; i < noteholder.childNodes.length; i++) {
 
-    var entry = noteholder.childNodes[i];
 
-    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
 
-      entriesToRemove.push(entry);
 
-  }
 
-  for (i = 0; i < entriesToRemove.length; i++) {
 
-    noteholder.removeChild(entriesToRemove[i]);
 
-  }
 
-
 
-  // Rebuild footnote entries.
 
-  var cont = document.getElementById("content");
 
-  var spans = cont.getElementsByTagName("span");
 
-  var refs = {};
 
-  var n = 0;
 
-  for (i=0; i<spans.length; i++) {
 
-    if (spans[i].className == "footnote") {
 
-      n++;
 
-      var note = spans[i].getAttribute("data-note");
 
-      if (!note) {
 
-        // Use [\s\S] in place of . so multi-line matches work.
 
-        // Because JavaScript has no s (dotall) regex flag.
 
-        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
 
-        spans[i].innerHTML =
 
-          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 
-          "' title='View footnote' class='footnote'>" + n + "</a>]";
 
-        spans[i].setAttribute("data-note", note);
 
-      }
 
-      noteholder.innerHTML +=
 
-        "<div class='footnote' id='_footnote_" + n + "'>" +
 
-        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
 
-        n + "</a>. " + note + "</div>";
 
-      var id =spans[i].getAttribute("id");
 
-      if (id != null) refs["#"+id] = n;
 
-    }
 
-  }
 
-  if (n == 0)
 
-    noteholder.parentNode.removeChild(noteholder);
 
-  else {
 
-    // Process footnoterefs.
 
-    for (i=0; i<spans.length; i++) {
 
-      if (spans[i].className == "footnoteref") {
 
-        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
 
-        href = href.match(/#.*/)[0];  // Because IE return full URL.
 
-        n = refs[href];
 
-        spans[i].innerHTML =
 
-          "[<a href='#_footnote_" + n +
 
-          "' title='View footnote' class='footnote'>" + n + "</a>]";
 
-      }
 
-    }
 
-  }
 
-},
 
-
 
-install: function(toclevels) {
 
-  var timerId;
 
-
 
-  function reinstall() {
 
-    asciidoc.footnotes();
 
-    if (toclevels) {
 
-      asciidoc.toc(toclevels);
 
-    }
 
-  }
 
-
 
-  function reinstallAndRemoveTimer() {
 
-    clearInterval(timerId);
 
-    reinstall();
 
-  }
 
-
 
-  timerId = setInterval(reinstall, 500);
 
-  if (document.addEventListener)
 
-    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
 
-  else
 
-    window.onload = reinstallAndRemoveTimer;
 
-}
 
-
 
-}
 
-asciidoc.install();
 
-/*]]>*/
 
-</script>
 
-</head>
 
-<body class="manpage">
 
-<div id="header">
 
-<h1>
 
-git-drover(1) Manual Page
 
-</h1>
 
-<h2>NAME</h2>
 
-<div class="sectionbody">
 
-<p>git-drover -
 
-   Apply a commit from the trunk to a release branch, or from one release branch to another.
 
-</p>
 
-</div>
 
-</div>
 
-<div id="content">
 
-<div class="sect1">
 
-<h2 id="_synopsis">SYNOPSIS</h2>
 
-<div class="sectionbody">
 
-<div class="verseblock">
 
-<pre class="content"><em>git drover</em> --branch &lt;branch&gt;
 
-           (--cherry-pick &lt;change&gt; | --continue [path_to_workdir] |
 
-            --abort [path_to_workdir])
 
-           [--parent_checkout &lt;path-to-existing-checkout&gt;]
 
-           [--verbose] [--dry-run]</pre>
 
-<div class="attribution">
 
-</div></div>
 
-</div>
 
-</div>
 
-<div class="sect1">
 
-<h2 id="_description">DESCRIPTION</h2>
 
-<div class="sectionbody">
 
-<div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from
 
-an existing checkout to avoid downloading a new checkout without affecting the
 
-existing checkout.</p></div>
 
-<div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the
 
-equivalent sequence of commands to run.</p></div>
 
-</div>
 
-</div>
 
-<div class="sect1">
 
-<h2 id="_options">OPTIONS</h2>
 
-<div class="sectionbody">
 
-<div class="dlist"><dl>
 
-<dt class="hdlist1">
 
---branch &lt;branch&gt;
 
-</dt>
 
-<dd>
 
-<p>
 
-  The branch to cherry-pick the commit to.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
---cherry-pick &lt;commit&gt;
 
-</dt>
 
-<dd>
 
-<p>
 
-  The commit to cherry-pick.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
---continue [path_to_workdir]
 
-</dt>
 
-<dd>
 
-<p>
 
-  Continue a cherry-pick that required manual resolution. The path to the drover
 
-  workdir is optional. If unspecified, the current directory is used.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
---abort [path_to_workdir]
 
-</dt>
 
-<dd>
 
-<p>
 
-  Abort a cherry-pick that required manual resolution and clean up its workdir.
 
-  The path to the drover workdir is optional. If unspecified, the current
 
-  directory is used.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
---parent_checkout
 
-</dt>
 
-<dd>
 
-<p>
 
-  The path to the chromium checkout to use as the source for a creating
 
-  git-new-workdir workdir to use for cherry-picking. If unspecified, the current
 
-  directory is used.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
--v
 
-</dt>
 
-<dt class="hdlist1">
 
---verbose
 
-</dt>
 
-<dd>
 
-<p>
 
-  Enable verbose logging.
 
-</p>
 
-</dd>
 
-<dt class="hdlist1">
 
---dry-run
 
-</dt>
 
-<dd>
 
-<p>
 
-  Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
 
-  into the branch.
 
-</p>
 
-</dd>
 
-</dl></div>
 
-</div>
 
-</div>
 
-<div class="sect1">
 
-<h2 id="_example">EXAMPLE</h2>
 
-<div class="sectionbody">
 
-<div class="sect2">
 
-<h3 id="_prerequisites">PREREQUISITES</h3>
 
-<div class="paragraph"><p>Before working with branches, you must
 
-<code>gclient sync --with_branch_heads</code>
 
-at least once to fetch the branches.</p></div>
 
-<div class="sect3">
 
-<h4 id="_merge_example">Merge Example</h4>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
 
-<span style="color: #e7e71c">commit 62472550afc1d8c317c49bdda05a241e1477e438</span>
 
-Author:     some.committer &lt;some.committer@chromium.org&gt;
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     some.committer &lt;some.committer@chromium.org&gt;
 
-CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-# Now do the 'drover'.
 
-<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 62472550afc1d8c317c49bdda05a241e1477e438</span>
 
-Going to cherry-pick
 
-"""
 
-<span style="color: #e7e71c">commit 62472550afc1d8c317c49bdda05a241e1477e438</span>
 
-Author: some.committer &lt;some.committer@chromium.org&gt;
 
-Date:   Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-"""
 
-to 9999. Continue (y/n)? y
 
-
 
-# A cl is uploaded to rietveld, where it can be reviewed before landing.
 
-
 
-About to land on 9999. Continue (y/n)? y
 
-# The cherry-pick cl is landed on the branch 9999.
 
-</code></pre></div></div><p><div class="paragraph"></p></div>
 
-</div>
 
-<div class="sect3">
 
-<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
 
-<span style="color: #e7e71c">commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
 
-Author:     some.committer &lt;some.committer@chromium.org&gt;
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     some.committer &lt;some.committer@chromium.org&gt;
 
-CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-# Now do the 'drover'.
 
-<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
 
-Going to cherry-pick
 
-"""
 
-<span style="color: #e7e71c">commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d</span>
 
-Author: some.committer &lt;some.committer@chromium.org&gt;
 
-Date:   Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-"""
 
-to 9999. Continue (y/n)? y
 
-
 
-Error: Patch failed to apply.
 
-
 
-A workdir for this cherry-pick has been created in
 
-  /tmp/drover_9999
 
-
 
-To continue, resolve the conflicts there and run
 
-  git drover --continue /tmp/drover_9999
 
-
 
-To abort this cherry-pick run
 
-  git drover --abort /tmp/drover_9999
 
-
 
-<span style="font-weight: bold; color: #ffffff">$ pushd /tmp/drover_9999</span>
 
-# Manually resolve conflicts.
 
-<span style="font-weight: bold; color: #ffffff">$ git add path/to/file_with_conflicts</span>
 
-<span style="font-weight: bold; color: #ffffff">$ popd</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git drover --continue /tmp/drover_9999</span>
 
-
 
-# A cl is uploaded to rietveld, where it can be reviewed before landing.
 
-
 
-About to land on 9999. Continue (y/n)? y
 
-# The cherry-pick cl is landed on the branch 9999.
 
-</code></pre></div></div><p><div class="paragraph"></p></div>
 
-</div>
 
-<div class="sect3">
 
-<h4 id="_revert_example">Revert Example</h4>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
 
-<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
 
-
 
-# Checkout the branch with the change we want to revert.
 
-<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
 
-Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
 
-
 
-# Here's the commit we want to revert.
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
 
-<span style="color: #e7e71c">commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5</span>
 
-Author: some.committer &lt;some.committer@chromium.org&gt;
 
-Date:   Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change is horribly broken.
 
-
 
-# Now do the revert.
 
-<span style="font-weight: bold; color: #ffffff">$ git revert fe52372519f5152cb7198467ed1a4f3c6f2bd8e5</span>
 
-
 
-# That reverted the change and committed the revert.
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
 
-<span style="color: #e7e71c">commit 72fef2931683370c31c218f114deed6f507df942</span>
 
-Author: you &lt;you@chromium.org&gt;
 
-Date:   Thu Apr 10 09:11:36 2014 +0000
 
-
 
-    Revert "This change is horribly broken."
 
-
 
-    This reverts commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5.
 
-
 
-# As with old drover, reverts are generally OK to commit without LGTM.
 
-<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</span>
 
-</code></pre></div></div><p><div class="paragraph"></p></div>
 
-<div class="paragraph"><p>If your cherrypick onto a release branch gets reverted, do not create a new
 
-cherrypick from main onto that release branch. Instead, use the "Reland"
 
-button on the original cherrypick CL.</p></div>
 
-</div>
 
-<div class="sect3">
 
-<h4 id="_manual_merge_example">Manual Merge Example</h4>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
 
-<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
 
-
 
-# Here's a commit (from some.committer) that we want to 'drover'.
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
 
-<span style="color: #e7e71c">commit 068a64822d90ab3b918425679816aee2d9be1e24</span>
 
-Author:     some.committer &lt;some.committer@chromium.org&gt;
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     some.committer &lt;some.committer@chromium.org&gt;
 
-CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-# Checkout the branch we want to 'drover' to.
 
-<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
 
-Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
 
-
 
-# Now do the 'drover'.
 
-# IMPORTANT!!! Do Not leave off the '-x' flag
 
-<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 068a64822d90ab3b918425679816aee2d9be1e24</span>
 
-[drover_9999 cda4a18] This change needs to go to branch 9999
 
- Author: some.committer &lt;some.committer@chromium.org&gt;
 
- Date: Thu Apr 10 08:54:46 2014 +0000
 
- 1 file changed, 1 insertion(+)
 
- create mode 100644 modified_file
 
-
 
-# That took the code authored by some.committer and committed it to
 
-# the branch by the person who drovered it (i.e. you).
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
 
-<span style="color: #e7e71c">commit cda4a18321ef3f603e955da6e263b6cadff11885</span>
 
-Author:     some.committer &lt;some.committer@chromium.org&gt;
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     you &lt;you@chromium.org&gt;
 
-CommitDate: Thu Apr 10 09:11:36 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-    (cherry picked from commit 068a64822d90ab3b918425679816aee2d9be1e24)
 
-
 
-# Looks good. Ship it!
 
-<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
 
-# Wait for LGTM or TBR it.
 
-<span style="font-weight: bold; color: #ffffff">$ git cl land</span>
 
-# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
 
-</code></pre></div></div><p><div class="paragraph"></p></div>
 
-<div class="paragraph"><p>If <code>git cl upload</code> errors out, the branch you&#8217;re uploading to probably has a CL
 
-with the same Change-Id. Instead of cherry-picking manually, use the Reland
 
-button in the Gerrit UI to create a new CL, and patch that CL into your client.</p></div>
 
-</div>
 
-</div>
 
-</div>
 
-</div>
 
-<div class="sect1">
 
-<h2 id="_see_also">SEE ALSO</h2>
 
-<div class="sectionbody">
 
-<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-revert.html">git-revert(1)</a></p></div>
 
-</div>
 
-</div>
 
-<div class="sect1">
 
-<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
 
-<div class="sectionbody">
 
-<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
 
-assist with the development of chromium and related projects. Download the tools
 
-by checking out the <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">git repository</a>.</p></div>
 
-</div>
 
-</div>
 
-</div>
 
-<div id="footnotes"><hr /></div>
 
-<div id="footer">
 
-<div id="footer-text">
 
-Last updated
 
- 2021-07-01 07:07:00 PDT
 
-</div>
 
-</div>
 
-</body>
 
-</html>

+ 11 - 7
man/html/git-footers.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-footers(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -838,18 +838,22 @@ refs/branch-heads/branchname</code></pre>
 
 <div class="sect1">
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git footers HEAD</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git footers HEAD</span>
 
 Tech-Debt-Introduced: -4 microMSOffices
 
 Tech-Debt-Introduced: 17 microMSOffices
 
 Cr-Commit-Position: refs/heads/main@{#292272}
 
-<span style="font-weight: bold; color: #ffffff">$ git footers --key Tech-Debt-Introduced HEAD</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git footers --key Tech-Debt-Introduced HEAD</span>
 
 -4 microMSOffices
 
 17 microMSOffices
 
-<span style="font-weight: bold; color: #ffffff">$ git footers --position HEAD</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git footers --position HEAD</span>
 
 refs/heads/main@{#292272}
 
-<span style="font-weight: bold; color: #ffffff">$ git footers --position-num HEAD</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git footers --position-num HEAD</span>
 
 292272
 
-<span style="font-weight: bold; color: #ffffff">$ git footers --position-ref HEAD</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git footers --position-ref HEAD</span>
 
 refs/heads/main
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 </div>
 
@@ -873,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
 
- 2021-10-05 09:49:24 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 33 - 28
man/html/git-freeze.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-freeze(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -781,46 +781,51 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
 
 <div class="sect1">
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git status --short</span>
 
-<span style="color: #19c518">A</span>  added_file
 
-<span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added_file_with_unstaged_changes
 
-<span style="color: #19c518">D</span>  deleted_file
 
- <span style="color: #e42e16">M</span> modified_file
 
- <span style="color: #e42e16">D</span> unstaged_deleted_file
 
-<span style="color: #e42e16">??</span> unadded_file
 
-<span style="font-weight: bold; color: #ffffff">$ git freeze</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
 
-<span style="color: #e7e71c">commit 2b8214881eb8a660a86c0551f84eb39e6763acf3</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
 
+<span style="color: #50FA7B">A</span>  added_file
 
+<span style="color: #50FA7B">A</span><span style="color: #FF5555">M</span> added_file_with_unstaged_changes
 
+<span style="color: #50FA7B">D</span>  deleted_file
 
+ <span style="color: #FF5555">M</span> modified_file
 
+ <span style="color: #FF5555">D</span> unstaged_deleted_file
 
+<span style="color: #FF5555">??</span> unadded_file
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git freeze</span>
 
+
 
+<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 0e48260b7ae6d82b41234fbe19ea6cb646a835de</span>
 
 Author: local &lt;local@chromium.org&gt;
 
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
 
     FREEZE.unindexed
 
 
- added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
 
- modified_file                    | 1 <span style="color: #19c518">+</span>
 
+ added_file_with_unstaged_changes | 1 <span style="color: #50FA7B">+</span>
 
+ modified_file                    | 1 <span style="color: #50FA7B">+</span>
 
  unadded_file                     | 0
 
- unstaged_deleted_file            | 1 <span style="color: #e42e16">-</span>
 
+ unstaged_deleted_file            | 1 <span style="color: #FF5555">-</span>
 
  4 files changed, 2 insertions(+), 1 deletion(-)
 
 
-<span style="color: #e7e71c">commit 4e1ca78d22a542047891f597545223dc6ce1b757</span>
 
+<span style="color: #F1FA8C">commit af7eb3e39942ada944e8489e6217753771f20562</span>
 
 Author: local &lt;local@chromium.org&gt;
 
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
 
     FREEZE.indexed
 
 
- added_file                       | 1 <span style="color: #19c518">+</span>
 
- added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
 
- deleted_file                     | 1 <span style="color: #e42e16">-</span>
 
+ added_file                       | 1 <span style="color: #50FA7B">+</span>
 
+ added_file_with_unstaged_changes | 1 <span style="color: #50FA7B">+</span>
 
+ deleted_file                     | 1 <span style="color: #FF5555">-</span>
 
  3 files changed, 2 insertions(+), 1 deletion(-)
 
-<span style="font-weight: bold; color: #ffffff">$ git thaw</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
 
-<span style="color: #19c518">A</span>  added_file
 
-<span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added_file_with_unstaged_changes
 
-<span style="color: #19c518">D</span>  deleted_file
 
- <span style="color: #e42e16">M</span> modified_file
 
- <span style="color: #e42e16">D</span> unstaged_deleted_file
 
-<span style="color: #e42e16">??</span> unadded_file
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git thaw</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
 
+<span style="color: #50FA7B">A</span>  added_file
 
+<span style="color: #50FA7B">A</span><span style="color: #FF5555">M</span> added_file_with_unstaged_changes
 
+<span style="color: #50FA7B">D</span>  deleted_file
 
+ <span style="color: #FF5555">M</span> modified_file
 
+ <span style="color: #FF5555">D</span> unstaged_deleted_file
 
+<span style="color: #FF5555">??</span> unadded_file
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 </div>
 
 </div>
 
@@ -854,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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 4 - 4
man/html/git-hyper-blame.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-hyper-blame(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -816,7 +816,7 @@ and any commits mentioned in this file are added to the ignore list.</p></div>
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
 <div class="paragraph"><p>Let&#8217;s run <code>git blame</code> on a file:</p></div>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git blame ipsum.txt</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git blame ipsum.txt</span>
 
 c6eb3bfa (lorem           2014-08-11 23:15:57 +0000 1) LOREM IPSUM DOLOR SIT AMET, CONSECTETUR
 
 3ddda43c (auto-uppercaser 2014-07-05 02:05:18 +0000 2) ADIPISCING ELIT, SED DO EIUSMOD TEMPOR
 
 3ddda43c (auto-uppercaser 2014-07-05 02:05:18 +0000 3) INCIDIDUNT UT LABORE ET DOLORE MAGNA
 
@@ -828,7 +828,7 @@ c6eb3bfa (lorem           2014-08-11 23:15:57 +0000 5) NOSTRUD EXERCITATION ULLA
 
 aren&#8217;t interested in the uppercasing of the file. You want to know who
 
 wrote/modified those lines in the first place. Just tell <code>hyper-blame</code> to ignore
 
 that commit:</p></div>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git hyper-blame -i 3ddda43c ipsum.txt</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git hyper-blame -i 3ddda43c ipsum.txt</span>
 
 c6eb3bfa (lorem 2014-08-11 23:15:57 +0000  1) LOREM IPSUM DOLOR SIT AMET, CONSECTETUR
 
 134200d1 (lorem 2014-04-10 08:54:46 +0000 2*) ADIPISCING ELIT, SED DO EIUSMOD TEMPOR
 
 a34a1d0d (ipsum 2014-04-11 11:25:04 +0000 3*) INCIDIDUNT UT LABORE ET DOLORE MAGNA
 
@@ -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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 20 - 18
man/html/git-map-branches.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-map-branches(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -849,22 +849,24 @@ Branches which have this as their parent are usually misconfigured, and
 
 <div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.html">git-map(1)</a>'s EXAMPLE section, and
 
 assuming that the <code>frozen_changes</code> branch was currently checked out, running
 
 <em>git map-branches</em> would result in an output like:</p></div>
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  no_upstream
 
-</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *
 
-</span><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  no_upstream          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/main            </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">3 commits </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
 
+<span style="color: #FF79C6"></span><span style="color: #FF79C6">{NO_UPSTREAM}
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  no_upstream
 
+</span><span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    frozen_branch *
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF79C6"></span><span style="color: #FF79C6">{NO_UPSTREAM}          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  no_upstream          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #FF5555"></span><span style="color: #FF5555">origin/main            </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature         </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">4 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature         </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit                </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    frozen_branch *    </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">3 commits </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">]
 
+</span>
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 </div>
 
 </div>
 
@@ -899,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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 23 - 23
man/html/git-map.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-map(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -835,27 +835,27 @@ configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
 <div class="paragraph"><p>Running <em>git map</em> would result in an output something like:
 
-</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d0fb9c7283</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f48f415e0f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ modfile
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4c5b9c0afd</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f7ce1e4b36</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">14db2e5a60</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ee3f972810</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ another improvement    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Add widget
 
-<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">cool_feature, fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map</span>
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d0fb9c7283</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; frozen_branch</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">f48f415e0f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ modfile
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4c5b9c0afd</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ a deleted file
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">f7ce1e4b36</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">fixit</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> ~ Add neat feature
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Epic README update
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">14db2e5a60</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">cool_feature</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> ~ Respond to CL comments
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">ee3f972810</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">subfeature</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> ~ integrate with CoolService
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ slick commenting action
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span><span style="color: #50FA7B">/</span>
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ another improvement    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">27abea4b40</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: #FF79C6"></span><span style="font-weight: bold; color: #FF79C6">spleen_tag</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 spleen
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add widget
 
+<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">cool_feature, fixit</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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 <div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly
 
 what the parents of each commit are.  In order to see the <em>upstream</em>
 
@@ -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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-mark-merge-base.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-mark-merge-base(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 26 - 22
man/html/git-nav-downstream.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-nav-downstream(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -773,13 +773,14 @@ command will prompt you with a selection of the branches.</p></div>
 
 <div class="sect1">
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
 
-</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
 
+<div class="paragraph"><p></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/main
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git nav-downstream</span>
 
 Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 
 Switched to branch 'cool_feature'
 
 Your branch is ahead of 'origin/main' by 4 commits.
 
@@ -788,23 +789,26 @@ Please select a downstream branch
 
   0. cool_feature
 
   1. fixit
 
 Selection (0-1)[0]: 0
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature *
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
 
-</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  cool_feature *
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">    subfeature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git nav-downstream</span>
 
 Switched to branch 'subfeature'
 
 Your branch and 'cool_feature' have diverged,
 
 and have 2 and 1 different commits each, respectively.
 
   (use "git pull" to merge the remote branch into yours)
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature *
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    subfeature *
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch
 
+</span>
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 </div>
 
 </div>
 
@@ -839,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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 27 - 22
man/html/git-nav-upstream.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-nav-upstream(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -771,23 +771,26 @@ checks that out.</p></div>
 
 <div class="sect1">
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature *
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
 
-</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
 
+<div class="paragraph"><p></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="color: #FF5555">origin/main
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    subfeature *
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git nav-upstream</span>
 
 Switched to branch 'cool_feature'
 
 Your branch is ahead of 'origin/main' by 4 commits.
 
   (use "git push" to publish your local commits)
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature *
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch
 
-</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  cool_feature *
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">    subfeature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git nav-upstream</span>
 
 Note: switching to 'origin/main'.
 
 
 You are in 'detached HEAD' state. You can look around, make experimental</span> <b>&lt;1&gt;</b><span>
 
@@ -806,12 +809,14 @@ Or undo this operation with:
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
 
 HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
 
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch</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/main
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch
 
+</span>
 
 </code></pre></div></div><p><div class="paragraph">
 
 1. Note that being in a <em>detached HEAD</em> state is OK. You&#8217;ll just want to create
 
 a <a href="git-new-branch.html">git-new-branch(1)</a> from here.</p></div>
 
@@ -848,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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 68 - 56
man/html/git-new-branch.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-new-branch(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -849,66 +849,78 @@ This is considered to be the <em>root</em> branch.</p></div>
 
 <div class="sect1">
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main            </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature         </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    frozen_branch *    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">3 commits </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
 
-</span><span style="font-weight: bold; color: #ffffff">$ git new-branch independent_cl</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/main           </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">          </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  cool_feature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit               </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch     </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  independent_cl *    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">          </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
 
-</span><span style="font-weight: bold; color: #ffffff">$ vi foo &amp;&amp; git add -A &amp;&amp; git commit -m foo</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main           </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    subfeature        </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit               </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch     </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  independent_cl *    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">1 commit  </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
 
-</span><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream subfeature nested_cl</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  cool_feature       </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">4 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    subfeature       </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">2 commits </span><span style="font-weight: bold; color: #ffffff">| </span><span style="font-weight: bold; color: #d338d3">behind 1 </span><span style="font-weight: bold; color: #ffffff">]</span> <b>&lt;1&gt;</b><span>
 
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">      nested_cl *    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">          </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">  fixit              </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch    </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl     </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">1 commit  </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main            </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature         </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">4 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature         </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit                </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    frozen_branch *    </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">3 commits </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">]
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git new-branch independent_cl</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">origin/main           </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">          </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature        </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">4 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature        </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit               </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch     </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">3 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  independent_cl *    </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">          </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ vi foo &amp;&amp; git add -A &amp;&amp; git commit -m foo</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main           </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature        </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">4 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    subfeature        </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit               </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch     </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">3 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  independent_cl *    </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">1 commit  </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">]
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git new-branch --upstream subfeature nested_cl</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  cool_feature       </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">4 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    subfeature       </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">2 commits </span><span style="font-weight: bold; color: #BFBFBF">| </span><span style="font-weight: bold; color: #FF79C6">behind 1 </span><span style="font-weight: bold; color: #BFBFBF">]</span> <b>&lt;1&gt;</b><span>
 
+</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">      nested_cl *    </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">          </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">  fixit              </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch    </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">3 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  independent_cl     </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">1 commit  </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git checkout cool_feature</span>
 
 Switched to branch 'cool_feature'
 
 Your branch is ahead of 'origin/main' by 4 commits.
 
   (use "git push" to publish your local commits)
 
-<span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main                         </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature                      </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">4 commits </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
 
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    cl_depends_on_cool_feature *    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">          </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">    subfeature                      </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">      nested_cl                     </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                             </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch                   </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl                    </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">1 commit  </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="font-weight: bold; color: #ffffff">$ git checkout subfeature</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main                         </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  cool_feature                      </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">4 commits </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">]
 
+</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    cl_depends_on_cool_feature *    </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">          </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">    subfeature                      </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">      nested_cl                     </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit                             </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch                   </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">3 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  independent_cl                    </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">1 commit  </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git checkout subfeature</span>
 
 Your branch and 'cool_feature' have diverged,
 
 and have 2 and 1 different commits each, respectively.
 
   (use "git pull" to merge the remote branch into yours)
 
-<span style="font-weight: bold; color: #ffffff">$ git new-branch --inject_current injected_cl</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map-branches -v</span>
 
-<span style="color: #e42e16"></span><span style="color: #e42e16">origin/main                       </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">  cool_feature                    </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">4 commits </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">]
 
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    cl_depends_on_cool_feature    </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">          </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
 
-</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">    injected_cl *                 </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">          </span><span style="font-weight: bold; color: #ffffff">  </span><span style="font-weight: bold; color: #d338d3">         </span><span style="font-weight: bold; color: #ffffff">
 
-</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518">      subfeature                  </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">        nested_cl                 </span><span style="color: #ffffff">  </span><span style="color: #d338d3">          </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  fixit                           </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">2 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">    frozen_branch                 </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">3 commits </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]
 
-</span><span style="color: #19c518"></span><span style="color: #19c518">  independent_cl                  </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">1 commit  </span><span style="color: #ffffff">  </span><span style="color: #d338d3">         </span><span style="color: #ffffff">]</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git new-branch --inject_current injected_cl</span>
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map-branches -v</span>
 
+<span style="color: #FF5555"></span><span style="color: #FF5555">origin/main                       </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">  cool_feature                    </span><span style="font-weight: bold; color: #BFBFBF">[ </span><span style="font-weight: bold; color: #FF79C6">4 commits </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">]
 
+</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    cl_depends_on_cool_feature    </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">          </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">
 
+</span><span style="font-weight: bold; color: #8BE9FD"></span><span style="font-weight: bold; color: #8BE9FD">    injected_cl *                 </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">          </span><span style="font-weight: bold; color: #BFBFBF">  </span><span style="font-weight: bold; color: #FF79C6">         </span><span style="font-weight: bold; color: #BFBFBF">
 
+</span><span style="font-weight: bold; color: #50FA7B"></span><span style="color: #50FA7B">      subfeature                  </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">| </span><span style="color: #FF79C6">behind 1 </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">        nested_cl                 </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">          </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  fixit                           </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">2 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">    frozen_branch                 </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">3 commits </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span><span style="color: #50FA7B"></span><span style="color: #50FA7B">  independent_cl                  </span><span style="color: #BFBFBF">[ </span><span style="color: #FF79C6">1 commit  </span><span style="color: #BFBFBF">  </span><span style="color: #FF79C6">         </span><span style="color: #BFBFBF">]
 
+</span>
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 <div class="olist arabic"><ol class="arabic">
 
 <li>
 
@@ -960,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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-rebase-update.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-rebase-update(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -956,7 +956,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
 
 <div id="footer">
 
 <div id="footer-text">
 
 Last updated
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-rename-branch.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-rename-branch(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-reparent-branch.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-reparent-branch(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-retry.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-retry(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 45 - 44
man/html/git-squash-branch.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-squash-branch(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -801,48 +801,49 @@ verify that the conflict diff is what you expected (and then skip it with
 
 <div class="sect1">
 
 <h2 id="_example">EXAMPLE</h2>
 
 <div class="sectionbody">
 
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d0fb9c7283</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f48f415e0f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ modfile
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4c5b9c0afd</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f7ce1e4b36</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">14db2e5a60</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ee3f972810</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ another improvement    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Add widget
 
-<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">cool_feature, fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
-
 
-<span style="font-weight: bold; color: #ffffff">$ git squash-branch -m 'cool squash demo'</span>
 
-<span style="font-weight: bold; color: #ffffff">$ git map</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">98e69e80b9</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">HEAD -&gt; frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">f7ce1e4b36</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Epic README update
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">14db2e5a60</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">ee3f972810</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #19c518"></span><span style="font-weight: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ slick commenting action
 
-<span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ another improvement    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor spleen
 
-<span style="color: #e42e16">|</span> * <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Add widget
 
-<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">(</span><span style="font-weight: bold; color: #e42e16">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">, </span><span style="font-weight: bold; color: #e42e16">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes    &lt;(<span style="color: #ffffff"></span><span style="font-weight: bold; color: #ffffff">fixit, cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
-* <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #BFBFBF">$ git map</span>
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d0fb9c7283</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; frozen_branch</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">f48f415e0f</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ modfile
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4c5b9c0afd</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ a deleted file
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">f7ce1e4b36</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">fixit</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> ~ Add neat feature
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Epic README update
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">14db2e5a60</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">cool_feature</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> ~ Respond to CL comments
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">ee3f972810</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">subfeature</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> ~ integrate with CoolService
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ slick commenting action
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span><span style="color: #50FA7B">/</span>
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ another improvement    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">27abea4b40</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: #FF79C6"></span><span style="font-weight: bold; color: #FF79C6">spleen_tag</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 spleen
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add widget
 
+<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">cool_feature, fixit</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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
+
 
+
 
+<span style="font-weight: bold; color: #BFBFBF">$ git squash-branch -m 'cool squash demo'</span>
 
+<span style="font-weight: bold; color: #BFBFBF">$ git map</span>
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">98e69e80b9</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; frozen_branch</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> ~ cool squash demo
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">f7ce1e4b36</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">fixit</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> ~ Add neat feature
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">3726937ae6</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Epic README update
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">14db2e5a60</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">cool_feature</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> ~ Respond to CL comments
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">ee3f972810</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">subfeature</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> ~ integrate with CoolService
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">4f9f5082c8</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ slick commenting action
 
+<span style="color: #FF5555">|</span> <span style="color: #50FA7B">|</span><span style="color: #50FA7B">/</span>
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">7d84f8580a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ another improvement    &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">subfeature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">27abea4b40</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: #FF79C6"></span><span style="font-weight: bold; color: #FF79C6">spleen_tag</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 spleen
 
+<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Add widget
 
+<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">cool_feature, fixit</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.
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">073b0c203a</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ContentView-&gt;ContentViewCore in ContentViewRenderView
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">2250f532d7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ ozone: evdev: Filter devices by path
 
+* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">33a7a742b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>	<span style="color: #F1FA8C">2014-04-10</span> ~ Always output seccomp error messages to stderr
 
 </code></pre></div></div><p><div class="paragraph"></p></div>
 
 </div>
 
 </div>
 
@@ -877,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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-thaw.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-thaw(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -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
 
- 2021-07-01 07:07:00 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 2 - 2
man/html/git-upstream-diff.html
Файл харах 

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
 
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 
-<meta name="generator" content="AsciiDoc 9.1.0" />
 
+<meta name="generator" content="AsciiDoc 10.2.0" />
 
 <title>git-upstream-diff(1)</title>
 
 <style type="text/css">
 
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -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
 
- 2021-10-26 10:54:02 PDT
 
+ 2022-08-26 21:13:38 PDT
 
 </div>
 
 </div>
 
 </body>

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/30/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools d6a493e4
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-CL" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-CL" "1" "08/30/2022" "depot_tools d6a493e4" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 0 - 330
man/man1/git-drover.1
Файл харах 

@@ -1,330 +0,0 @@
 
-'\" t
 
-.\"     Title: git-drover
 
-.\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
 
-.\"      Date: 07/01/2021
 
-.\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
-.\"  Language: English
 
-.\"
 
-.TH "GIT\-DROVER" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
-.\" -----------------------------------------------------------------
 
-.\" * Define some portability stuff
 
-.\" -----------------------------------------------------------------
 
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.\" http://bugs.debian.org/507673
 
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
 
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.ie \n(.g .ds Aq \(aq
 
-.el       .ds Aq '
 
-.\" -----------------------------------------------------------------
 
-.\" * set default formatting
 
-.\" -----------------------------------------------------------------
 
-.\" disable hyphenation
 
-.nh
 
-.\" disable justification (adjust text to left margin only)
 
-.ad l
 
-.\" -----------------------------------------------------------------
 
-.\" * MAIN CONTENT STARTS HERE *
 
-.\" -----------------------------------------------------------------
 
-.SH "NAME"
 
-git-drover \- Apply a commit from the trunk to a release branch, or from one release branch to another\&.
 
-.SH "SYNOPSIS"
 
-.sp
 
-.nf
 
-\fIgit drover\fR \-\-branch <branch>
 
-           (\-\-cherry\-pick <change> | \-\-continue [path_to_workdir] |
 
-            \-\-abort [path_to_workdir])
 
-           [\-\-parent_checkout <path\-to\-existing\-checkout>]
 
-           [\-\-verbose] [\-\-dry\-run]
 
-.fi
 
-.sp
 
-.SH "DESCRIPTION"
 
-.sp
 
-\fBgit drover\fR applies a commit to a release branch\&. It creates a new workdir from an existing checkout to avoid downloading a new checkout without affecting the existing checkout\&.
 
-.sp
 
-\fBgit drover\fR does not support reverts\&. See the EXAMPLE section for the equivalent sequence of commands to run\&.
 
-.SH "OPTIONS"
 
-.PP
 
-\-\-branch <branch>
 
-.RS 4
 
-The branch to cherry\-pick the commit to\&.
 
-.RE
 
-.PP
 
-\-\-cherry\-pick <commit>
 
-.RS 4
 
-The commit to cherry\-pick\&.
 
-.RE
 
-.PP
 
-\-\-continue [path_to_workdir]
 
-.RS 4
 
-Continue a cherry\-pick that required manual resolution\&. The path to the drover workdir is optional\&. If unspecified, the current directory is used\&.
 
-.RE
 
-.PP
 
-\-\-abort [path_to_workdir]
 
-.RS 4
 
-Abort a cherry\-pick that required manual resolution and clean up its workdir\&. The path to the drover workdir is optional\&. If unspecified, the current directory is used\&.
 
-.RE
 
-.PP
 
-\-\-parent_checkout
 
-.RS 4
 
-The path to the chromium checkout to use as the source for a creating git\-new\-workdir workdir to use for cherry\-picking\&. If unspecified, the current directory is used\&.
 
-.RE
 
-.PP
 
-\-v, \-\-verbose
 
-.RS 4
 
-Enable verbose logging\&.
 
-.RE
 
-.PP
 
-\-\-dry\-run
 
-.RS 4
 
-Skip landing the cherry\-pick\&. Just ensure that the commit can be cherry\-picked into the branch\&.
 
-.RE
 
-.SH "EXAMPLE"
 
-.SS "PREREQUISITES"
 
-.sp
 
-Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR at least once to fetch the branches\&.
 
-.sp
 
-.it 1 an-trap
 
-.nr an-no-space-flag 1
 
-.nr an-break-flag 1
 
-.br
 
-.ps +1
 
-\fBMerge Example\fR
 
-.RS 4
 
-.sp
 
-
 
-.sp
 
-.if n \{\
 
-.RS 4
 
-.\}
 
-.nf
 
-# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
 
-\fB$ git log \-n 1 \-\-pretty=fuller\fR
 
-commit 2b725ed09457c407978f3352d9df21ca0e9ec360
 
-Author:     some\&.committer <some\&.committer@chromium\&.org>
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     some\&.committer <some\&.committer@chromium\&.org>
 
-CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-# Now do the \*(Aqdrover\*(Aq\&.
 
-\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 2b725ed09457c407978f3352d9df21ca0e9ec360\fR
 
-Going to cherry\-pick
 
-"""
 
-commit 2b725ed09457c407978f3352d9df21ca0e9ec360
 
-Author: some\&.committer <some\&.committer@chromium\&.org>
 
-Date:   Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-"""
 
-to 9999\&. Continue (y/n)? y
 
-
 
-# A cl is uploaded to rietveld, where it can be reviewed before landing\&.
 
-
 
-About to land on 9999\&. Continue (y/n)? y
 
-# The cherry\-pick cl is landed on the branch 9999\&.
 
-.fi
 
-.if n \{\
 
-.RE
 
-.\}
 
-.sp
 
-.RE
 
-.sp
 
-.it 1 an-trap
 
-.nr an-no-space-flag 1
 
-.nr an-break-flag 1
 
-.br
 
-.ps +1
 
-\fBMerge with Conflicts Example\fR
 
-.RS 4
 
-.sp
 
-
 
-.sp
 
-.if n \{\
 
-.RS 4
 
-.\}
 
-.nf
 
-# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
 
-\fB$ git log \-n 1 \-\-pretty=fuller\fR
 
-commit 930308494aae515233533c87d4fe289613b07129
 
-Author:     some\&.committer <some\&.committer@chromium\&.org>
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     some\&.committer <some\&.committer@chromium\&.org>
 
-CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-# Now do the \*(Aqdrover\*(Aq\&.
 
-\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 930308494aae515233533c87d4fe289613b07129\fR
 
-Going to cherry\-pick
 
-"""
 
-commit 930308494aae515233533c87d4fe289613b07129
 
-Author: some\&.committer <some\&.committer@chromium\&.org>
 
-Date:   Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-"""
 
-to 9999\&. Continue (y/n)? y
 
-
 
-Error: Patch failed to apply\&.
 
-
 
-A workdir for this cherry\-pick has been created in
 
-  /tmp/drover_9999
 
-
 
-To continue, resolve the conflicts there and run
 
-  git drover \-\-continue /tmp/drover_9999
 
-
 
-To abort this cherry\-pick run
 
-  git drover \-\-abort /tmp/drover_9999
 
-
 
-\fB$ pushd /tmp/drover_9999\fR
 
-# Manually resolve conflicts\&.
 
-\fB$ git add path/to/file_with_conflicts\fR
 
-\fB$ popd\fR
 
-\fB$ git drover \-\-continue /tmp/drover_9999\fR
 
-
 
-# A cl is uploaded to rietveld, where it can be reviewed before landing\&.
 
-
 
-About to land on 9999\&. Continue (y/n)? y
 
-# The cherry\-pick cl is landed on the branch 9999\&.
 
-.fi
 
-.if n \{\
 
-.RE
 
-.\}
 
-.sp
 
-.RE
 
-.sp
 
-.it 1 an-trap
 
-.nr an-no-space-flag 1
 
-.nr an-break-flag 1
 
-.br
 
-.ps +1
 
-\fBRevert Example\fR
 
-.RS 4
 
-.sp
 
-
 
-.sp
 
-.if n \{\
 
-.RS 4
 
-.\}
 
-.nf
 
-# Make sure we have the most up\-to\-date branch sources\&.
 
-\fB$ git fetch\fR
 
-
 
-# Checkout the branch with the change we want to revert\&.
 
-\fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
 
-Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/9999\*(Aq\&.
 
-
 
-# Here\*(Aqs the commit we want to revert\&.
 
-\fB$ git log \-n 1\fR
 
-commit 95b57f29626b892a27e6c15ef65097d92ff5ad06
 
-Author: some\&.committer <some\&.committer@chromium\&.org>
 
-Date:   Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change is horribly broken\&.
 
-
 
-# Now do the revert\&.
 
-\fB$ git revert 95b57f29626b892a27e6c15ef65097d92ff5ad06\fR
 
-
 
-# That reverted the change and committed the revert\&.
 
-\fB$ git log \-n 1\fR
 
-commit 471e1016918da2858a2a83ebd2cf7a8165f915f2
 
-Author: you <you@chromium\&.org>
 
-Date:   Thu Apr 10 09:11:36 2014 +0000
 
-
 
-    Revert "This change is horribly broken\&."
 
-
 
-    This reverts commit 95b57f29626b892a27e6c15ef65097d92ff5ad06\&.
 
-
 
-# As with old drover, reverts are generally OK to commit without LGTM\&.
 
-\fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
 
-\fB$ git cl land \-\-bypass\-hooks\fR
 
-.fi
 
-.if n \{\
 
-.RE
 
-.\}
 
-.sp
 
-.sp
 
-If your cherrypick onto a release branch gets reverted, do not create a new cherrypick from main onto that release branch\&. Instead, use the "Reland" button on the original cherrypick CL\&.
 
-.RE
 
-.sp
 
-.it 1 an-trap
 
-.nr an-no-space-flag 1
 
-.nr an-break-flag 1
 
-.br
 
-.ps +1
 
-\fBManual Merge Example\fR
 
-.RS 4
 
-.sp
 
-
 
-.sp
 
-.if n \{\
 
-.RS 4
 
-.\}
 
-.nf
 
-# Make sure we have the most up\-to\-date branch sources\&.
 
-\fB$ git fetch\fR
 
-
 
-# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
 
-\fB$ git log \-n 1 \-\-pretty=fuller\fR
 
-commit f92d9f7d7a38ee974538eae525db4830d93f8908
 
-Author:     some\&.committer <some\&.committer@chromium\&.org>
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     some\&.committer <some\&.committer@chromium\&.org>
 
-CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-# Checkout the branch we want to \*(Aqdrover\*(Aq to\&.
 
-\fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
 
-Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/9999\*(Aq\&.
 
-
 
-# Now do the \*(Aqdrover\*(Aq\&.
 
-# IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
 
-\fB$ git cherry\-pick \-x f92d9f7d7a38ee974538eae525db4830d93f8908\fR
 
-[drover_9999 50bb9b6] This change needs to go to branch 9999
 
- Author: some\&.committer <some\&.committer@chromium\&.org>
 
- Date: Thu Apr 10 08:54:46 2014 +0000
 
- 1 file changed, 1 insertion(+)
 
- create mode 100644 modified_file
 
-
 
-# That took the code authored by some\&.committer and committed it to
 
-# the branch by the person who drovered it (i\&.e\&. you)\&.
 
-\fB$ git log \-n 1 \-\-pretty=fuller\fR
 
-commit 50bb9b6c903108d2e3ce76c90a5810936af017d7
 
-Author:     some\&.committer <some\&.committer@chromium\&.org>
 
-AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 
-Commit:     you <you@chromium\&.org>
 
-CommitDate: Thu Apr 10 09:11:36 2014 +0000
 
-
 
-    This change needs to go to branch 9999
 
-
 
-    (cherry picked from commit f92d9f7d7a38ee974538eae525db4830d93f8908)
 
-
 
-# Looks good\&. Ship it!
 
-\fB$ git cl upload\fR
 
-# Wait for LGTM or TBR it\&.
 
-\fB$ git cl land\fR
 
-# Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq
 
-.fi
 
-.if n \{\
 
-.RE
 
-.\}
 
-.sp
 
-.sp
 
-If \fBgit cl upload\fR errors out, the branch you\(cqre uploading to probably has a CL with the same Change\-Id\&. Instead of cherry\-picking manually, use the Reland button in the Gerrit UI to create a new CL, and patch that CL into your client\&.
 
-.RE
 
-.SH "SEE ALSO"
 
-.sp
 
-\fBgit-cherry-pick\fR(1), \fBgit-revert\fR(1)
 
-.SH "CHROMIUM DEPOT_TOOLS"
 
-.sp
 
-Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools by checking out the \m[blue]\fBgit repository\fR\m[]\&\s-2\u[1]\d\s+2\&.
 
-.SH "NOTES"
 
-.IP " 1." 4
 
-git repository
 
-.RS 4
 
-\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
 
-.RE

+ 7 - 3
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: 10/05/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools a594dbdd
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-FOOTERS" "1" "10/05/2021" "depot_tools a594dbdd" "Chromium depot_tools Manual"
 
+.TH "GIT\-FOOTERS" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -116,13 +116,17 @@ in the example above)\&.
 
 Tech\-Debt\-Introduced: \-4 microMSOffices
 
 Tech\-Debt\-Introduced: 17 microMSOffices
 
 Cr\-Commit\-Position: refs/heads/main@{#292272}
 
+
 
 \fB$ git footers \-\-key Tech\-Debt\-Introduced HEAD\fR
 
 \-4 microMSOffices
 
 17 microMSOffices
 
+
 
 \fB$ git footers \-\-position HEAD\fR
 
 refs/heads/main@{#292272}
 
+
 
 \fB$ git footers \-\-position\-num HEAD\fR
 
 292272
 
+
 
 \fB$ git footers \-\-position\-ref HEAD\fR
 
 refs/heads/main
 
 .fi

+ 10 - 5
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-FREEZE" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-FREEZE" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -57,10 +57,13 @@ D  deleted_file
 
  M modified_file
 
  D unstaged_deleted_file
 
 ?? unadded_file
 
+
 
 \fB$ git freeze\fR
 
+
 
 \fB$ git status \-\-short\fR
 
+
 
 \fB$ git log \-n 2 \-\-stat\fR
 
-commit 288d7302bb306adec039d7ca24870d8d0ca14f36
 
+commit 3eb0e183eb4b1f8d5ce1ff29be3ced2ca85d8951
 
 Author: local <local@chromium\&.org>
 
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
 
@@ -72,7 +75,7 @@ Date:   Thu Apr 10 08:54:56 2014 +0000
 
  unstaged_deleted_file            | 1 \-
 
  4 files changed, 2 insertions(+), 1 deletion(\-)
 
 
-commit 9533cdaea75b6973d439f91b7f6007479db0f5a4
 
+commit b57d611f2738de2193ec16f150991a4bc8dbd2fe
 
 Author: local <local@chromium\&.org>
 
 Date:   Thu Apr 10 08:54:56 2014 +0000
 
 
@@ -82,7 +85,9 @@ Date:   Thu Apr 10 08:54:56 2014 +0000
 
  added_file_with_unstaged_changes | 1 +
 
  deleted_file                     | 1 \-
 
  3 files changed, 2 insertions(+), 1 deletion(\-)
 
+
 
 \fB$ git thaw\fR
 
+
 
 \fB$ git status \-\-short\fR
 
 A  added_file
 
 AM added_file_with_unstaged_changes

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-HYPER\-BLAME" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-HYPER\-BLAME" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 7 - 5
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-MAP\-BRANCHES" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-MAP\-BRANCHES" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -168,14 +168,16 @@ origin/main
 
     subfeature
 
   fixit
 
 \fB    frozen_branch *
 
-$ git map\-branches \-v\fR
 
+\fR
 
+\fB$ git map\-branches \-v\fR
 
 {NO_UPSTREAM}
 
   no_upstream
 
 origin/main
 
   cool_feature         [ 4 commits            ]
 
     subfeature         [ 2 commits | behind 1 ]
 
   fixit                [ 2 commits            ]
 
-\fB    frozen_branch *    [ 3 commits            ]\fR
 
+\fB    frozen_branch *    [ 3 commits            ]
 
+\fR
 
 .fi
 
 .if n \{\
 
 .RE

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-MAP" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-MAP" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-MARK\-MERGE\-BA" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-MARK\-MERGE\-BA" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 6 - 3
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-NAV\-DOWNSTREAM" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-NAV\-DOWNSTREAM" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -52,6 +52,7 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
 
     subfeature
 
   fixit
 
     frozen_branch
 
+
 
 \fB$ git nav\-downstream\fR
 
 Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
 
 Switched to branch \*(Aqcool_feature\*(Aq
 
@@ -67,11 +68,13 @@ origin/main
 
 \fR    subfeature
 
   fixit
 
     frozen_branch
 
+
 
 \fB$ git nav\-downstream\fR
 
 Switched to branch \*(Aqsubfeature\*(Aq
 
 Your branch and \*(Aqcool_feature\*(Aq have diverged,
 
 and have 2 and 1 different commits each, respectively\&.
 
   (use "git pull" to merge the remote branch into yours)
 
+
 
 \fB$ git map\-branches\fR
 
 origin/main
 
   cool_feature

+ 7 - 3
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-NAV\-UPSTREAM" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-NAV\-UPSTREAM" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -52,16 +52,19 @@ origin/main
 
 \fB    subfeature *
 
 \fR  fixit
 
     frozen_branch
 
+
 
 \fB$ git nav\-upstream\fR
 
 Switched to branch \*(Aqcool_feature\*(Aq
 
 Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
 
   (use "git push" to publish your local commits)
 
+
 
 \fB$ git map\-branches\fR
 
 origin/main
 
 \fB  cool_feature *
 
 \fR    subfeature
 
   fixit
 
     frozen_branch
 
+
 
 \fB$ git nav\-upstream\fR
 
 Note: switching to \*(Aqorigin/main\*(Aq\&.
 
 
@@ -81,6 +84,7 @@ Or undo this operation with:
 
 Turn off this advice by setting config variable advice\&.detachedHead to false
 
 
 HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
 
+
 
 \fB$ git map\-branches\fR
 
 \fBorigin/main
 
 \fR  cool_feature

+ 17 - 6
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-NEW\-BRANCH" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-NEW\-BRANCH" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -100,7 +100,9 @@ origin/main
 
     subfeature         [ 2 commits | behind 1 ]
 
   fixit                [ 2 commits            ]
 
 \fB    frozen_branch *    [ 3 commits            ]
 
-$ git new\-branch independent_cl\fR
 
+\fR
 
+\fB$ git new\-branch independent_cl\fR
 
+
 
 \fB$ git map\-branches \-v\fR
 
 \fBorigin/main
 
 \fR  cool_feature        [ 4 commits            ]
 
@@ -108,7 +110,8 @@ $ git new\-branch independent_cl\fR
 
   fixit               [ 2 commits            ]
 
     frozen_branch     [ 3 commits            ]
 
 \fB  independent_cl *
 
-$ vi foo && git add \-A && git commit \-m foo\fR
 
+\fR
 
+\fB$ vi foo && git add \-A && git commit \-m foo\fR
 
 \fB$ git map\-branches \-v\fR
 
 origin/main
 
   cool_feature        [ 4 commits            ]
 
@@ -116,7 +119,9 @@ origin/main
 
   fixit               [ 2 commits            ]
 
     frozen_branch     [ 3 commits            ]
 
 \fB  independent_cl *    [ 1 commit             ]
 
-$ git new\-branch \-\-upstream subfeature nested_cl\fR
 
+\fR
 
+\fB$ git new\-branch \-\-upstream subfeature nested_cl\fR
 
+
 
 \fB$ git map\-branches \-v\fR
 
 origin/main
 
   cool_feature       [ 4 commits            ]
 
@@ -125,11 +130,14 @@ origin/main
 
 \fR  fixit              [ 2 commits            ]
 
     frozen_branch    [ 3 commits            ]
 
   independent_cl     [ 1 commit             ]
 
+
 
 \fB$ git checkout cool_feature\fR
 
 Switched to branch \*(Aqcool_feature\*(Aq
 
 Your branch is ahead of \*(Aqorigin/main\*(Aq by 4 commits\&.
 
   (use "git push" to publish your local commits)
 
+
 
 \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR
 
+
 
 \fB$ git map\-branches \-v\fR
 
 origin/main
 
 \fB  cool_feature                      [ 4 commits            ]
 
@@ -139,11 +147,14 @@ origin/main
 
   fixit                             [ 2 commits            ]
 
     frozen_branch                   [ 3 commits            ]
 
   independent_cl                    [ 1 commit             ]
 
+
 
 \fB$ git checkout subfeature\fR
 
 Your branch and \*(Aqcool_feature\*(Aq have diverged,
 
 and have 2 and 1 different commits each, respectively\&.
 
   (use "git pull" to merge the remote branch into yours)
 
+
 
 \fB$ git new\-branch \-\-inject_current injected_cl\fR
 
+
 
 \fB$ git map\-branches \-v\fR
 
 origin/main
 
 \fB  cool_feature                    [ 4 commits            ]

+ 3 - 3
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-REBASE\-UPDATE" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-REBASE\-UPDATE" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-RENAME\-BRANCH" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-RENAME\-BRANCH" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 3 - 3
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-REPARENT\-BRANC" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-REPARENT\-BRANC" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-RETRY" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-RETRY" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 4 - 3
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-SQUASH\-BRANCH" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-SQUASH\-BRANCH" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -76,6 +76,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 \fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR
 
 \fB$ git map\fR
 
 * \fB98e69e80b9\fR	\fB(HEAD \-> frozen_branch\fR\fB) \fR2014\-04\-10 ~ cool squash demo

+ 3 - 3
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-THAW" "1" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "GIT\-THAW" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 3 - 3
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: 10/26/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 5c9e8b47
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "GIT\-UPSTREAM\-DIFF" "1" "10/26/2021" "depot_tools 5c9e8b47" "Chromium depot_tools Manual"
 
+.TH "GIT\-UPSTREAM\-DIFF" "1" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------

+ 3 - 8
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 906b5026
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "DEPOT_TOOLS" "7" "07/01/2021" "depot_tools 906b5026" "Chromium depot_tools Manual"
 
+.TH "DEPOT_TOOLS" "7" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -47,11 +47,6 @@ A tutorial for these tools can be found at \fBdepot_tools_tutorial\fR(7)\&.
 
 Interact with code reviews on Gerrit and Rietveld
 
 .RE
 
 .PP
 
-\fBgit-drover\fR(1)
 
-.RS 4
 
-Apply a commit from the trunk to a release branch, or from one release branch to another\&.
 
-.RE
 
-.PP
 
 \fBgit-footers\fR(1)
 
 .RS 4
 
 Extract meta\-information expressed as footers in a commit message\&.

+ 54 - 24
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: 07/01/2021
 
+.\"      Date: 08/26/2022
 
 .\"    Manual: Chromium depot_tools Manual
 
-.\"    Source: depot_tools 696f1e12
 
+.\"    Source: depot_tools 59e95c91
 
 .\"  Language: English
 
 .\"
 
-.TH "DEPOT_TOOLS_TUTORIAL" "7" "07/01/2021" "depot_tools 696f1e12" "Chromium depot_tools Manual"
 
+.TH "DEPOT_TOOLS_TUTORIAL" "7" "08/26/2022" "depot_tools 59e95c91" "Chromium depot_tools Manual"
 
 .\" -----------------------------------------------------------------
 
 .\" * Define some portability stuff
 
 .\" -----------------------------------------------------------------
 
@@ -564,6 +564,7 @@ Let\*(Aqs fix something!
 
 .\}
 
 .nf
 
 \fB$ git new\-branch fix_typo\fR
 
+
 
 \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\&.txt\fR
 
 1503
 
 It was a Domo\-Banana\&.
 
@@ -572,6 +573,7 @@ It was a Domo\-Kuun\&.
 
 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR
 
 [fix_typo 615ffa7] Fix terrible typo\&.
 
  1 file changed, 1 insertion(+), 1 deletion(\-)
 
+
 
 \fB$ git map\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
 
@@ -582,12 +584,14 @@ It was a Domo\-Kuun\&.
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 \fB$ git status\fR
 
 On branch fix_typo
 
 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
 
+
 
 \fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
 
 \&.\&.\&. truncated output \&.\&.\&.
 
 .fi
 
@@ -602,10 +606,12 @@ While we wait for feedback, let\*(Aqs do something else\&.
 
 .\}
 
 .nf
 
 \fB$ git new\-branch chap2\fR
 
+
 
 \fB$ git map\-branches\fR
 
 \fBorigin/main
 
   chap2 *
 
 \fR  fix_typo
 
+
 
 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR
 
 
 "You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
 
@@ -622,6 +628,7 @@ Changes not staged for commit:
 
 	modified:   build/whitespace_file\&.txt
 
 
 no changes added to commit (use "git add" and/or "git commit \-a")
 
+
 
 .fi
 
 .if n \{\
 
 .RE
 
@@ -634,20 +641,22 @@ Someone on the code review pointed out that our typo\-fix has a typo :( We\*(Aqr
 
 .\}
 
 .nf
 
 \fB$ git freeze\fR
 
+
 
 \fB$ git checkout fix_typo\fR
 
 Switched to branch \*(Aqfix_typo\*(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
 
 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\fR
 
-\fBindex 3eba355\&.\&.57cdcee 100644\fR
 
-\fB\-\-\- a/build/whitespace_file\&.txt\fR
 
-\fB+++ b/build/whitespace_file\&.txt\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\&.
 
@@ -656,9 +665,11 @@ It was a Domo\-BananaKun\&.
 
 
 "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 \&.\&.\&.
 
 .fi
 
@@ -686,6 +697,7 @@ Since we got lgtm, let the CQ land it\&.
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 .fi
 
 .if n \{\
 
 .RE
 
@@ -701,7 +713,8 @@ Switch back to where we were using the nav* commands (for fun\&.\&.\&. git check
 
 origin/main
 
   chap2
 
 \fB  fix_typo *
 
-$ git nav\-upstream\fR
 
+\fR
 
+\fB$ git nav\-upstream\fR
 
 Note: switching to \*(Aqorigin/main\*(Aq\&.
 
 
 You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental
 
@@ -720,6 +733,7 @@ Or undo this operation with:
 
 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 beec6f4 Make ReflectorImpl use mailboxes
 
 Switched to branch \*(Aqchap2\*(Aq
 
@@ -733,6 +747,7 @@ Selection (0\-1)[0]: 0
 
 origin/main
 
 \fB  chap2 *
 
 \fR  fix_typo
 
+
 
 .fi
 
 .if n \{\
 
 .RE
 
@@ -745,11 +760,12 @@ Now we can pick up on chapter2 where we left off\&.
 
 .\}
 
 .nf
 
 \fB$ git thaw\fR
 
+
 
 \fB$ git diff\fR
 
-\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR
 
-\fBindex 3eba355\&.\&.9d08d9d 100644\fR
 
-\fB\-\-\- a/build/whitespace_file\&.txt\fR
 
-\fB+++ b/build/whitespace_file\&.txt\fR
 
+\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
 
 @@ \-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
 
@@ -758,15 +774,16 @@ Now we can pick up on chapter2 where we left off\&.
 
 +"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
 
-\fBdiff \-\-git a/build/whitespace_file\&.txt b/build/whitespace_file\&.txt\fR
 
-\fBindex 3eba355\&.\&.e3a55de 100644\fR
 
-\fB\-\-\- a/build/whitespace_file\&.txt\fR
 
-\fB+++ b/build/whitespace_file\&.txt\fR
 
+\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
 
 @@ \-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
 
@@ -777,9 +794,11 @@ EOF
 
 +when the fan was last cleaned\&.
 
 +
 
 +There was an poignant pause\&.
 
+\fR
 
 \fB$ git commit \-am \*(AqFinish chapter 2\*(Aq\fR
 
 [chap2 ceef712] Finish chapter 2
 
  1 file changed, 6 insertions(+)
 
+
 
 \fB$ git map\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!
 
@@ -793,6 +812,7 @@ EOF
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 \fB$ git cl upload \-r domo@chromium\&.org \-\-send\-mail\fR
 
 \&.\&.\&. truncated output \&.\&.\&.
 
 .fi
 
@@ -819,6 +839,7 @@ While that runs through the CQ, let\*(Aqs get started on chapter 3\&. Since we k
 
 .\}
 
 .nf
 
 \fB$ git new\-branch \-\-upstream_current chap3\fR
 
+
 
 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR
 
 
 CHAPTER 3:
 
@@ -828,6 +849,7 @@ EOF
 
 \fB$ git commit \-am \*(Aqbeginning of chapter 3\*(Aq\fR
 
 [chap3 7d4238a] beginning of chapter 3
 
  1 file changed, 4 insertions(+)
 
+
 
 \fB$ git map\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
 
@@ -842,6 +864,7 @@ EOF
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 .fi
 
 .if n \{\
 
 .RE
 
@@ -895,6 +918,7 @@ Well look at that\&. The CQ landed our typo and chapter2 branches already and gi
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 .fi
 
 .if n \{\
 
 .RE
 
@@ -913,10 +937,10 @@ From https://upstream
 
 Rebasing: chap2
 
 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.
 
 \fB$ git diff\fR
 
-\fBdiff \-\-cc build/whitespace_file\&.txt\fR
 
-\fBindex 1293282,f903ea2\&.\&.0000000\fR
 
-\fB\-\-\- a/build/whitespace_file\&.txt\fR
 
-\fB+++ b/build/whitespace_file\&.txt\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\&.
 
 
@@ -927,6 +951,7 @@ Rebasing: chap2
 
 + 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
 
@@ -941,11 +966,12 @@ Oh, well, that\*(Aqs not too bad\&. In fact\&.\&.\&. that\*(Aqs a terrible chapt
 
 \fB$ $EDITOR build/whitespace_file\&.txt\fR
 
 \&.\&.\&. /me deletes bad chapter 3 \&.\&.\&.
 
 \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\fR
 
-\fBindex 1293282\&.\&.f903ea2 100644\fR
 
-\fB\-\-\- a/build/whitespace_file\&.txt\fR
 
-\fB+++ b/build/whitespace_file\&.txt\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\&.
 
 
@@ -953,6 +979,7 @@ Oh, well, that\*(Aqs not too bad\&. In fact\&.\&.\&. that\*(Aqs a terrible chapt
 
 \-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
 
@@ -967,11 +994,13 @@ Much better
 
 \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
 
 chap3 up\-to\-date
 
 
 Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
 
+
 
 \fB$ gclient sync\fR
 
 \&.\&.\&. truncated output \&.\&.\&.
 
 \fB$ git map\fR
 
@@ -993,6 +1022,7 @@ Running `git gc \-\-auto` \- Ctrl\-C to abort is OK\&.
 
 * \fB2250f532d7\fR	2014\-04\-10 ~ ozone: evdev: Filter devices by path
 
 * \fB33a7a742b7\fR	2014\-04\-10 ~ Always output seccomp error messages to stderr
 
 
+
 
 \fB$ git cl upload\fR
 
 \&.\&.\&. truncated output \&.\&.\&.
 
 .fi

+ 0 - 2
man/src/_git-drover_desc.helper.txt
Файл харах 

@@ -1,2 +0,0 @@
 
-Apply a commit from the trunk to a release branch, or from one release branch to
 
-another.

+ 5 - 6
man/src/common_demo_functions.sh
Файл харах 

@@ -30,20 +30,20 @@ c() {
 
 }
 
 
 praw() {
 
-  echo -e "\x1B[37;1m$ $@\x1B[m"
 
+  echo -e "\x1B[37;1m$ $@\x1B[0m"
 
 }
 
 
 # print a visible command (but don't run it)
 
 pcommand() {
 
-  praw "$(python -c '\
 
-    import sys, pipes; \
 
-    print(" ".join(map(pipes.quote, sys.argv[1:])))' "$@")"
 
+  praw "$(python3 -c 'import sys, pipes; print(" ".join(map(pipes.quote, sys.argv[1:])))' "$@")"
 
 }
 
 
 # run a visible command
 
 run() {
 
   pcommand "$@"
 
   "$@"
 
+  # Some commands may not reset style, so issue reset command
 
+  echo -e "\x1B[0m"
 
 }
 
 
 comment() {
 
@@ -70,8 +70,7 @@ add() {
 
   local CONTENT=$2
 
   if [[ ! $CONTENT ]]
 
   then
 
-    CONTENT=$(python -c 'import random, string; \
 
-      print("".join(random.sample(string.lowercase, 16)))')
 
+    CONTENT=$(python3 -c 'import random, string; print("".join(random.sample(string.ascii_lowercase, 16)))')
 
   fi
 
   echo "$CONTENT" > $1
 
   silent git add $1

+ 1 - 1
man/src/depot_tools_tutorial.demo.walkthrough.sh
Файл харах 

@@ -22,7 +22,7 @@ add_ws() {
 
 ed_ws() {
 
   echo -ne "\x1B[37;1m$ echo -e "
 
   echo -n "'$1'"
 
-  echo -e " | ed $WS\x1B[m"
 
+  echo -e " | ed $WS\x1B[0m"
 
   echo -e "$1" | ed $WS 2>&1
 
 }

+ 5 - 11
man/src/filter_demo_output.py
Файл харах 

@@ -1,4 +1,4 @@
 
-#!/usr/bin/env python
 
+#!/usr/bin/env python3
 
 # Copyright 2014 The Chromium Authors. All rights reserved.
 
 # Use of this source code is governed by a BSD-style license that can be
 
 # found in the LICENSE file.
 
@@ -11,8 +11,7 @@ import re
 
 import sys
 
 
 from xml.sax.saxutils import escape
 
-
 
-from cStringIO import StringIO
 
+from io import StringIO
 
 
 if not os.path.exists('ansi2html'):
 
   print('You must run ./make_docs.sh once before running this script.')
 
@@ -60,11 +59,6 @@ def simpleXML(string):
 
 
 
 def main():
 
-  ansi2html.converter.SCHEME['custom'] = (
 
-      "#000000", "#e42e16", "#19c518", "#e7e71c", "#492ee1",
 
-      "#d338d3", "#33d6e5", "#ffffff",
 
-  )
 
-
 
   backend = sys.argv[1]
 
   output = sys.stdin.read().rstrip()
 
 
@@ -87,7 +81,7 @@ def main():
 
         '</p></div><div class="listingblock"><div class="content"><pre><code>'
 
     )
 
     postamble = '</code></pre></div></div><p><div class="paragraph">'
 
-    c = ansi2html.Ansi2HTMLConverter(inline=True, scheme='custom')
 
+    c = ansi2html.Ansi2HTMLConverter(inline=True, scheme='dracula')
 
 
     in_code = False
 
     body = c.convert(output, full=False)
 
@@ -102,7 +96,7 @@ def main():
 
           w(preamble)
 
           in_code = True
 
         ext = ''
 
-        for _ in xrange(callouts[i]):
 
+        for _ in range(callouts[i]):
 
           if not ext:
 
             ext += '</span>'
 
           ext += ' <b>&lt;%d&gt;</b>' % callout_counter
 
@@ -129,7 +123,7 @@ def main():
 
           w(preamble)
 
           in_code = True
 
         ext = ''
 
-        for _ in xrange(callouts[i]):
 
+        for _ in range(callouts[i]):
 
           ext += '  <emphasis role="strong">(%d)</emphasis>' % callout_counter
 
           callout_counter += 1
 
         w(line + ext + '\n')

+ 0 - 22
man/src/git-drover.demo.1.sh
Файл харах 

@@ -1,22 +0,0 @@
 
-#!/usr/bin/env bash
 
-. git-drover.demo.common.sh
 
-
 
-drover_c "This change needs to go to branch 9999"
 
-
 
-echo "# Here's a commit (from some.committer) that we want to 'drover'."
 
-run git log -n 1 --pretty=fuller
 
-echo
 
-echo "# Now do the 'drover'."
 
-pcommand git drover --branch 9999 \
 
-  --cherry-pick $(git show-ref -s pick_commit)
 
-
 
-echo "Going to cherry-pick"
 
-echo '"""'
 
-output git log -n 1
 
-echo '"""'
 
-echo "to 9999. Continue (y/n)? y"
 
-echo
 
-echo "# A cl is uploaded to rietveld, where it can be reviewed before landing."
 
-echo
 
-echo "About to land on 9999. Continue (y/n)? y"
 
-echo "# The cherry-pick cl is landed on the branch 9999."

+ 0 - 23
man/src/git-drover.demo.2.sh
Файл харах 

@@ -1,23 +0,0 @@
 
-#!/usr/bin/env bash
 
-. git-drover.demo.common.sh
 
-
 
-echo "# Make sure we have the most up-to-date branch sources."
 
-run git fetch
 
-echo
 
-echo "# Checkout the branch with the change we want to revert."
 
-run git checkout -b drover_9999 branch-heads/9999
 
-echo
 
-drover_c "This change is horribly broken."
 
-echo "# Here's the commit we want to revert."
 
-run git log -n 1
 
-echo
 
-echo "# Now do the revert."
 
-silent git revert --no-edit $(git show-ref -s pick_commit)
 
-pcommand git revert $(git show-ref -s pick_commit)
 
-echo
 
-echo "# That reverted the change and committed the revert."
 
-run git log -n 1
 
-echo
 
-echo "# As with old drover, reverts are generally OK to commit without LGTM."
 
-pcommand git cl upload -r some.committer@chromium.org --send-mail
 
-run git cl land --bypass-hooks

+ 0 - 27
man/src/git-drover.demo.3.sh
Файл харах 

@@ -1,27 +0,0 @@
 
-#!/usr/bin/env bash
 
-. git-drover.demo.common.sh
 
-
 
-drover_c "This change needs to go to branch 9999"
 
-
 
-echo "# Make sure we have the most up-to-date branch sources."
 
-run git fetch
 
-echo
 
-echo "# Here's a commit (from some.committer) that we want to 'drover'."
 
-run git log -n 1 --pretty=fuller
 
-echo
 
-echo "# Checkout the branch we want to 'drover' to."
 
-run git checkout -b drover_9999 branch-heads/9999
 
-echo
 
-echo "# Now do the 'drover'."
 
-echo "# IMPORTANT!!! Do Not leave off the '-x' flag"
 
-run git cherry-pick -x $(git show-ref -s pick_commit)
 
-echo
 
-echo "# That took the code authored by some.committer and committed it to"
 
-echo "# the branch by the person who drovered it (i.e. you)."
 
-run git log -n 1 --pretty=fuller
 
-echo
 
-echo "# Looks good. Ship it!"
 
-pcommand git cl upload
 
-echo "# Wait for LGTM or TBR it."
 
-run git cl land
 
-echo "# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'"

+ 0 - 39
man/src/git-drover.demo.4.sh
Файл харах 

@@ -1,39 +0,0 @@
 
-#!/usr/bin/env bash
 
-. git-drover.demo.common.sh
 
-
 
-drover_c "This change needs to go to branch 9999"
 
-
 
-echo "# Here's a commit (from some.committer) that we want to 'drover'."
 
-run git log -n 1 --pretty=fuller
 
-echo
 
-echo "# Now do the 'drover'."
 
-pcommand git drover --branch 9999 \
 
-  --cherry-pick $(git show-ref -s pick_commit)
 
-
 
-echo "Going to cherry-pick"
 
-echo '"""'
 
-output git log -n 1
 
-echo '"""'
 
-echo "to 9999. Continue (y/n)? y"
 
-echo
 
-echo "Error: Patch failed to apply."
 
-echo
 
-echo "A workdir for this cherry-pick has been created in"
 
-echo "  /tmp/drover_9999"
 
-echo
 
-echo "To continue, resolve the conflicts there and run"
 
-echo "  git drover --continue /tmp/drover_9999"
 
-echo
 
-echo "To abort this cherry-pick run"
 
-echo "  git drover --abort /tmp/drover_9999"
 
-echo
 
-pcommand pushd /tmp/drover_9999
 
-echo "# Manually resolve conflicts."
 
-pcommand git add path/to/file_with_conflicts
 
-pcommand popd
 
-pcommand git drover --continue /tmp/drover_9999
 
-echo
 
-echo "# A cl is uploaded to rietveld, where it can be reviewed before landing."
 
-echo
 
-echo "About to land on 9999. Continue (y/n)? y"
 
-echo "# The cherry-pick cl is landed on the branch 9999."

+ 0 - 19
man/src/git-drover.demo.common.sh
Файл харах 

@@ -1,19 +0,0 @@
 
-#!/usr/bin/env bash
 
-. demo_repo.sh
 
-
 
-# Add and tag a dummy commit to refer to later.
 
-drover_c() {
 
-  add modified_file
 
-  set_user some.committer
 
-  c "$1"
 
-  silent git tag -f pick_commit
 
-  set_user you
 
-  tick 1000
 
-}
 
-
 
-silent git push origin refs/remotes/origin/main:refs/branch-heads/9999
 
-silent git config --add remote.origin.fetch \
 
-  +refs/branch-heads/*:refs/remotes/branch-heads/*
 
-silent git fetch origin
 
-
 
-silent git checkout -B main origin/main

+ 0 - 102
man/src/git-drover.txt
Файл харах 

@@ -1,102 +0,0 @@
 
-git-drover(1)
 
-=============
 
-
 
-NAME
 
-----
 
-git-drover -
 
-include::_git-drover_desc.helper.txt[]
 
-
 
-SYNOPSIS
 
---------
 
-[verse]
 
-'git drover' --branch <branch>
 
-           (--cherry-pick <change> | --continue [path_to_workdir] |
 
-            --abort [path_to_workdir])
 
-           [--parent_checkout <path-to-existing-checkout>]
 
-           [--verbose] [--dry-run]
 
-
 
-DESCRIPTION
 
------------
 
-
 
-`git drover` applies a commit to a release branch. It creates a new workdir from
 
-an existing checkout to avoid downloading a new checkout without affecting the
 
-existing checkout.
 
-
 
-`git drover` does not support reverts. See the EXAMPLE section for the
 
-equivalent sequence of commands to run.
 
-
 
-OPTIONS
 
--------
 
---branch <branch>::
 
-  The branch to cherry-pick the commit to.
 
-
 
---cherry-pick <commit>::
 
-  The commit to cherry-pick.
 
-
 
---continue [path_to_workdir]::
 
-  Continue a cherry-pick that required manual resolution. The path to the drover
 
-  workdir is optional. If unspecified, the current directory is used.
 
-
 
---abort [path_to_workdir]::
 
-  Abort a cherry-pick that required manual resolution and clean up its workdir.
 
-  The path to the drover workdir is optional. If unspecified, the current
 
-  directory is used.
 
-
 
---parent_checkout::
 
-  The path to the chromium checkout to use as the source for a creating
 
-  git-new-workdir workdir to use for cherry-picking. If unspecified, the current
 
-  directory is used.
 
-
 
--v::
 
---verbose::
 
-  Enable verbose logging.
 
-
 
---dry-run::
 
-  Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
 
-  into the branch.
 
-
 
-EXAMPLE
 
--------
 
-
 
-PREREQUISITES
 
-~~~~~~~~~~~~~
 
-Before working with branches, you must
 
-ifdef::backend-xhtml11[]
 
-`gclient sync --with_branch_heads`
 
-endif::backend-xhtml11[]
 
-ifdef::backend-docbook[]
 
-'gclient sync --with_branch_heads'
 
-endif::backend-docbook[]
 
-at least once to fetch the branches.
 
-
 
-Merge Example
 
-^^^^^^^^^^^^^
 
-demo:1[]
 
-
 
-Merge with Conflicts Example
 
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-demo:4[]
 
-
 
-Revert Example
 
-^^^^^^^^^^^^^^
 
-demo:2[]
 
-
 
-If your cherrypick onto a release branch gets reverted, do not create a new
 
-cherrypick from main onto that release branch. Instead, use the "Reland"
 
-button on the original cherrypick CL.
 
-
 
-Manual Merge Example
 
-^^^^^^^^^^^^^^^^^^^^
 
-demo:3[]
 
-
 
-If `git cl upload` errors out, the branch you're uploading to probably has a CL
 
-with the same Change-Id. Instead of cherry-picking manually, use the Reland
 
-button in the Gerrit UI to create a new CL, and patch that CL into your client.
 
-
 
-SEE ALSO
 
---------
 
-linkgit:git-cherry-pick[1], linkgit:git-revert[1]
 
-
 
-include::_footer.txt[]
 
-
 
-// vim: ft=asciidoc:

+ 14 - 11
man/src/make_docs.sh
Файл харах 

@@ -4,6 +4,9 @@ set -e
 
 
 shopt -s nullglob
 
 
+# disable metrics report
 
+export DEPOT_TOOLS_METRICS=0
 
+
 
 cd $(dirname "$0")
 
 
 # Script which takes all the asciidoc git-*.txt files in this directory, renders
 
@@ -34,22 +37,22 @@ then
 
 fi
 
 
 # We pull asciidoc to get the right version
 
-BRANCH=9.1.0
 
-ASCIIDOC_HASH=9705d428439530104ce55d0ba12e8ef9d1b57ad1
 
+BRANCH=10.2.0
 
+ASCIIDOC_HASH=545b79b8d7dae70d12bf0657359bdd36de0c5c26
 
 if [[ ! -d asciidoc || $(cd asciidoc && git rev-parse HEAD) != $ASCIIDOC_HASH ]]
 
 then
 
   echo Cloning asciidoc
 
   rm -rf asciidoc
 
   git clone --branch $BRANCH https://github.com/asciidoc-py/asciidoc-py asciidoc
 
-  (cd asciidoc && ln -s asciidoc.py asciidoc)
 
+  (cd asciidoc/asciidoc && ln -s asciidoc.py asciidoc)
 
 fi
 
 echo Asciidoc up to date at $ASCIIDOC_HASH \($BRANCH\)
 
 
-export PATH=`pwd`/asciidoc:$PATH
 
+export PATH=`pwd`/asciidoc/asciidoc:$PATH
 
 
 # We pull ansi2hash to convert demo script output
 
-BRANCH=1.6.0
 
-ANSI2HTML_HASH=1ca0e862dda765c55e9124bf50a06a3e2f769521
 
+BRANCH=1.8.0
 
+ANSI2HTML_HASH=545b79b8d7dae70d12bf0657359bdd36de0c5c26
 
 if [[ ! -d ansi2html || $(git -C ansi2html rev-parse HEAD) != $ANSI2HTML_HASH ]]
 
 then
 
   echo Cloning ansi2html
 
@@ -61,8 +64,8 @@ fi
 
 echo ansi2html up to date at $ANSI2HTML_HASH \($BRANCH\)
 
 
 # We pull git to get its documentation toolchain
 
-BRANCH=v2.32.0
 
-GITHASH=ebf3c04b262aa27fbb97f8a0156c2347fecafafb
 
+BRANCH=v2.35.1
 
+GITHASH=4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a
 
 if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
 
 then
 
   echo Cloning git
 
@@ -71,7 +74,7 @@ then
 
     https://kernel.googlesource.com/pub/scm/git/git.git  2> /dev/null
 
 ed git/Documentation/Makefile <<EOF
 
 H
 
-141
 
+142
 
 s/Git Manual/Chromium depot_tools Manual
 
 s/Git/depot_tools
 
 wq
 
@@ -131,7 +134,7 @@ EOF
 
 (?su)[\\\\]?(?P<name>demo):(?P<target>\S*?)\[\]=
 
 
 [demo-inlinemacro]
 
-{sys3:cd $(pwd); ./{docname}.demo.{target}.sh | python filter_demo_output.py {backend} }
 
+{sys3:cd $(pwd); ./{docname}.demo.{target}.sh | python3 filter_demo_output.py {backend} }
 
 EOF
 
 
 fi
 
@@ -229,7 +232,7 @@ fi
 
 (
 
   export GIT_DIR="$(git rev-parse --git-dir)" &&
 
   cd git/Documentation &&
 
-  GIT_EDITOR=true make -j"$JOBS" "${MAN1_TARGETS[@]}" "${MAN7_TARGETS[@]}" "${HTML_TARGETS[@]}" 
+  GIT_EDITOR=true make "${MAN1_TARGETS[@]}" "${MAN7_TARGETS[@]}" "${HTML_TARGETS[@]}"
 
 )
 
 
 for x in "${HTML_TARGETS[@]}"