diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/depot_tools.html
similarity index 87%
copy from git_docs/htmlout/git-thaw.html
copy to docs/html/depot_tools.html
index cc2683a..1c3084a 100644
--- a/git_docs/htmlout/git-thaw.html
+++ b/docs/html/depot_tools.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 8.6.9" />
-<title>git-thaw(1)</title>
+<title>depot_tools(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -734,53 +741,95 @@
 <body class="manpage">
 <div id="header">
 <h1>
-git-thaw(1) Manual Page
+depot_tools(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
-<p>git-thaw -
-   Un-freeze all changes on a frozen branch.
+<p>depot_tools -
+   A collection of tools for dealing with Chromium development.
 </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 thaw</em></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 thaw</code> takes a frozen branch (as made by <a href="git-freeze.html">git-freeze(1)</a>), and returns
-it to the status that it was in before it was frozen.</p></div>
-<div class="paragraph"><p>If you freeze a branch multiple times (i.e. change files, freeze, change files,
-freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">SEE ALSO</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><a href="git-freeze.html">git-freeze(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 depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
+<div class="paragraph"><p>The Chromium depot_tools suite contains many tools to assist/augment the
+Chromium development environment. The tools may be downloaded from
 <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>There are two primary categories of tools. Some of these tools are <em>essential</em>
+to the development flow, in the sense that you cannot successfully develop
+Chromium without them.</p></div>
+<div class="paragraph"><p>Other tools are merely <em>helper</em> tools. Not required, but they can substantially
+ease the develpment workflow.</p></div>
+<div class="paragraph"><p>A listing of both categories of tools follows.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_helper_tools">HELPER TOOLS</h2>
+<div class="sectionbody">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<a href="git-freeze.html">git-freeze(1)</a>
+</dt>
+<dd>
+<p>
+Freeze all changes on a branch (indexed and unindexed).
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-map-branches.html">git-map-branches(1)</a>
+</dt>
+<dd>
+<p>
+Helper script to display all local git branches with ‘upstream’ hierarchy in
+colorized terminal format.
+</p>
+</dd>
+</dl></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<a href="git-map.html">git-map(1)</a>
+</dt>
+<dd>
+<p>
+Display history of all branches in a colorized terminal format.
+</p>
+</dd>
+</dl></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<a href="git-nav-downstream.html">git-nav-downstream(1)</a>
+</dt>
+<dd>
+<p>
+Checkout a downstream branch of the currently checked out branch.
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-nav-upstream.html">git-nav-upstream(1)</a>
+</dt>
+<dd>
+<p>
+Checkout the upstream branch of the currently checked out branch.
+</p>
+</dd>
+<dt class="hdlist1">
+<a href="git-thaw.html">git-thaw(1)</a>
+</dt>
+<dd>
+<p>
+Un-freeze all changes on a frozen branch.
+</p>
+</dd>
+</dl></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 13:12:40 PDT
 </div>
 </div>
 </body>
diff --git a/git_docs/htmlout/git-freeze.html b/docs/html/git-freeze.html
similarity index 86%
rename from git_docs/htmlout/git-freeze.html
rename to docs/html/git-freeze.html
index 3f1abf5..f938c5c 100644
--- a/git_docs/htmlout/git-freeze.html
+++ b/docs/html/git-freeze.html
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -739,7 +746,7 @@
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-freeze -
-   Freeze all changes on a branch (indexed and unindexed)
+   Freeze all changes on a branch (indexed and unindexed).
 </p>
 </div>
 </div>
@@ -769,6 +776,54 @@
 </div>
 </div>
 <div class="sect1">
+<h2 id="_example">EXAMPLE</h2>
+<div class="sectionbody">
+<div class="listingblock">
+<div class="content">
+<pre><code><strong><span class="white">$ git status --short</span></strong>
+<span class="green">A</span>  added_file
+<span class="green">A</span>&#8203;<span class="red">M</span> added_file_with_unstaged_changes
+<span class="green">D</span>  deleted_file
+ <span class="red">M</span> modified_file
+ <span class="red">D</span> unstaged_deleted_file
+<span class="red">??</span> unadded_file
+<strong><span class="white">$ git freeze</span></strong>
+<strong><span class="white">$ git status --short</span></strong>
+<strong><span class="white">$ git log -n 2 --stat</span></strong>
+<span class="yellow">commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd</span>
+Author: Robert Iannucci &lt;iannucci@chromium.org&gt;
+Date:   Thu Mar 13 17:42:37 2014 -0700
+
+    FREEZE.unindexed
+
+ added_file_with_unstaged_changes | 3 <span class="green">++</span>&#8203;<span class="red">-</span>
+ modified_file                    | 4 <span class="green">+++</span>&#8203;<span class="red">-</span>
+ unadded_file                     | 3 <span class="green">+++</span>
+ unstaged_deleted_file            | 1 <span class="red">-</span>
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+
+<span class="yellow">commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4</span>
+Author: Robert Iannucci &lt;iannucci@chromium.org&gt;
+Date:   Thu Mar 13 17:42:37 2014 -0700
+
+    FREEZE.indexed
+
+ added_file                       | 3 <span class="green">+++</span>
+ added_file_with_unstaged_changes | 1 <span class="green">+</span>
+ deleted_file                     | 1 <span class="red">-</span>
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+<strong><span class="white">$ git thaw</span></strong>
+<strong><span class="white">$ git status --short</span></strong>
+<span class="green">A</span>  added_file
+<span class="green">A</span>&#8203;<span class="red">M</span> added_file_with_unstaged_changes
+<span class="green">D</span>  deleted_file
+ <span class="red">M</span> modified_file
+ <span class="red">D</span> unstaged_deleted_file
+<span class="red">??</span> unadded_file</code></pre>
+</div></div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
 <div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div>
@@ -777,16 +832,16 @@
 <div class="sect1">
 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Part of the chromium depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 14:01:10 PDT
 </div>
 </div>
 </body>
diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-map-branches.html
similarity index 84%
copy from git_docs/htmlout/git-thaw.html
copy to docs/html/git-map-branches.html
index cc2683a..e6d160c 100644
--- a/git_docs/htmlout/git-thaw.html
+++ b/docs/html/git-map-branches.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 8.6.9" />
-<title>git-thaw(1)</title>
+<title>git-map-branches(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -734,12 +741,12 @@
 <body class="manpage">
 <div id="header">
 <h1>
-git-thaw(1) Manual Page
+git-map-branches(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
-<p>git-thaw -
-   Un-freeze all changes on a frozen branch.
+<p>git-map-branches -
+   Helper script to display all local git branches with ‘upstream’ hierarchy in colorized terminal format.
 </p>
 </div>
 </div>
@@ -748,7 +755,7 @@
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git thaw</em></pre>
+<pre class="content"><em>git map-branches</em></pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -756,31 +763,95 @@
 <div class="sect1">
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><code>git thaw</code> takes a frozen branch (as made by <a href="git-freeze.html">git-freeze(1)</a>), and returns
-it to the status that it was in before it was frozen.</p></div>
-<div class="paragraph"><p>If you freeze a branch multiple times (i.e. change files, freeze, change files,
-freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
+<div class="paragraph"><p>Git map-branches displays all local branches such that:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Current branch is <span class="aqua">cyan</span>.
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+The branch which will be modified with git-commit is denoted with an asterisk
+         (<code>*</code>) after the name.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Local branches are <span class="green">green</span>.
+</p>
+</li>
+<li>
+<p>
+Remote branches are <span class="red">red</span> (usually, the root of all other branches).
+</p>
+</li>
+<li>
+<p>
+<code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">magenta</span>.
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Branches which have this as their parent are usually misconfigured, and
+         should be assigned a parent by checking out the branch and running git branch
+         --set-upstream-to=&lt;correct parent branch&gt;.
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">If multiple branches are on the same commit, they will all be cyan.</td>
+</tr></table>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_example">EXAMPLE</h2>
+<div class="sectionbody">
+<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="listingblock">
+<div class="content">
+<pre><code><strong><span class="white">$ git map-branches</span></strong>
+<span class="red">origin/master</span>
+  <span class="green">cool_feature</span>
+    <span class="green">subfeature</span>
+  <span class="aqua">frozen_changes *</span>
+  <span class="green">master</span>
+<span class="fuchsia">{NO UPSTREAM}</span>
+  <span class="green">bogus_noparent</span>
+  <span class="aqua">duplicate_cool_feature_no_upstream</span></code></pre>
+</div></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div>
+<div class="paragraph"><p><a href="git-map.html">git-map(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 depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 14:01:10 PDT
 </div>
 </div>
 </body>
diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-map.html
similarity index 72%
copy from git_docs/htmlout/git-thaw.html
copy to docs/html/git-map.html
index cc2683a..828e1c0 100644
--- a/git_docs/htmlout/git-thaw.html
+++ b/docs/html/git-map.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 8.6.9" />
-<title>git-thaw(1)</title>
+<title>git-map(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -734,12 +741,12 @@
 <body class="manpage">
 <div id="header">
 <h1>
-git-thaw(1) Manual Page
+git-map(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
-<p>git-thaw -
-   Un-freeze all changes on a frozen branch.
+<p>git-map -
+   Display history of all branches in a colorized terminal format.
 </p>
 </div>
 </div>
@@ -748,7 +755,7 @@
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git thaw</em></pre>
+<pre class="content"><em>git map</em> [&lt;extra_args&gt;&#8230;]</pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -756,31 +763,116 @@
 <div class="sect1">
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><code>git thaw</code> takes a frozen branch (as made by <a href="git-freeze.html">git-freeze(1)</a>), and returns
-it to the status that it was in before it was frozen.</p></div>
-<div class="paragraph"><p>If you freeze a branch multiple times (i.e. change files, freeze, change files,
-freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
+<div class="paragraph"><p>Git map formats the output of <code>git log --graph</code> from all refs such that:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Current branch is <span class="aqua">cyan</span>.
+</p>
+</li>
+<li>
+<p>
+Local branches are <span class="green">green</span>.
+</p>
+</li>
+<li>
+<p>
+Remote branches are <span class="red">red</span>.
+</p>
+</li>
+<li>
+<p>
+Tags are <span class="fuchsia">magenta</span>.
+</p>
+</li>
+<li>
+<p>
+The currently checked out commit is highlighted with a <span class="yellow blue-background">blue background</span>.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The output is automatically piped through the <code>less</code> pager command, even on
+windows.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_options">OPTIONS</h2>
+<div class="sectionbody">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+&lt;extra_args&gt;&#8230;
+</dt>
+<dd>
+<p>
+        Extra parameters to pass to the internal <a href="git-log.html">git-log(1)</a> invocation. This
+        can be used to restrict what refs <em>git map</em> operates on, etc.
+</p>
+<div class="paragraph"><p>If you run git map with a series of fixed arguments frequently, you can use
+the depot_tools.map_extra configuration variable to pre-set arguments (See
+<code>CONFIGURATION VARIABLES</code>)</p></div>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_depot_tools_map_extra">depot_tools.map_extra</h3>
+<div class="paragraph"><p>Each value of the <em>depot_tools.map_extra</em> config variable is applied as an
+additional argument to <code>git log</code> during the execution of git map. If you wish to
+configure this, use git <code>config --add depot_tools.map_extra &lt;value&gt;</code> to do so.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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><strong><span class="white">$ git map</span></strong>
+<span class="white blue-background">*</span>&#8203;<strong><span class="blue-background red"> 7dcfe47       </span></strong> <span class="green">(</span>&#8203;<strong><span class="aqua">frozen_changes</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed
+* <strong><span class="red">4b0c180</span></strong>        <span class="yellow">2014-03-12</span> ~ modfile
+* <strong><span class="red">59a7cca</span></strong>        <span class="yellow">2014-03-12</span> ~ a deleted file
+* <strong><span class="red">6bec695</span></strong>        <span class="green">(</span>&#8203;<span class="red">origin/master</span>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Add neat feature
+* <strong><span class="red">d15a38a</span></strong>        <span class="yellow">2014-03-11</span> ~ Epic README update
+* <strong><span class="red">d559894</span></strong>        <span class="green">(</span>&#8203;<strong><span class="lime">master</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Important upstream change
+<span class="red">|</span> * <strong><span class="red">9c311fd</span></strong>      <span class="green">(</span>&#8203;<strong><span class="lime">cool_feature</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Respond to CL comments
+<span class="red">|</span> <span class="green">|</span> * <strong><span class="red">2a1eeb2</span></strong>    <span class="green">(</span>&#8203;<strong><span class="lime">subfeature</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ integrate with CoolService
+<span class="red">|</span> <span class="green">|</span> * <strong><span class="red">d777af6</span></strong>    <span class="yellow">2014-03-11</span> ~ slick commenting action
+<span class="red">|</span> <span class="green">|/</span>
+<span class="red">|</span> * <strong><span class="red">265803a</span></strong>      <span class="yellow">2014-03-11</span> ~ another improvement
+<span class="red">|</span> * <strong><span class="red">6d831ac</span></strong>      <span class="green">(</span>&#8203;<strong><span class="fuchsia">spleen_tag</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Refactor spleen
+<span class="red">|</span> * <strong><span class="red">82e74ab</span></strong>      <span class="yellow">2014-03-11</span> ~ Add widget
+<span class="red">|/</span>
+* <strong><span class="red">d08c5b3</span></strong>        <span class="green">(</span>&#8203;<strong><span class="lime">bogus_noparent</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful beginnings</code></pre>
+</div></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>
+relationships of the branches (i.e. which branch is tracking which other
+branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command.</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div>
+<div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(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 depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 14:01:55 PDT
 </div>
 </div>
 </body>
diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-nav-downstream.html
similarity index 86%
copy from git_docs/htmlout/git-thaw.html
copy to docs/html/git-nav-downstream.html
index cc2683a..da5b509 100644
--- a/git_docs/htmlout/git-thaw.html
+++ b/docs/html/git-nav-downstream.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 8.6.9" />
-<title>git-thaw(1)</title>
+<title>git-nav-downstream(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -734,12 +741,12 @@
 <body class="manpage">
 <div id="header">
 <h1>
-git-thaw(1) Manual Page
+git-nav-downstream(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
-<p>git-thaw -
-   Un-freeze all changes on a frozen branch.
+<p>git-nav-downstream -
+   Checkout a downstream branch of the currently checked out branch.
 </p>
 </div>
 </div>
@@ -748,7 +755,7 @@
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git thaw</em></pre>
+<pre class="content"><em>git nav-downstream</em></pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -756,31 +763,62 @@
 <div class="sect1">
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><code>git thaw</code> takes a frozen branch (as made by <a href="git-freeze.html">git-freeze(1)</a>), and returns
-it to the status that it was in before it was frozen.</p></div>
-<div class="paragraph"><p>If you freeze a branch multiple times (i.e. change files, freeze, change files,
-freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
+<div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch and discovers all branches
+downstream of it. If there is only one branch downstream of the current branch,
+the command will check that out. If there's more than one downstream branch, the
+command will prompt you with a selection of the branches.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_example">EXAMPLE</h2>
+<div class="sectionbody">
+<div class="listingblock">
+<div class="content">
+<pre><code><strong><span class="white">$ git map-branches</span></strong>
+<strong><span class="red">origin/master *&#8203;</span></strong>
+  <span class="green">cool_feature</span>
+    <span class="green">subfeature</span>
+  <span class="green">frozen_changes</span>
+  <span class="green">master</span>
+<span class="fuchsia">{NO UPSTREAM}</span>
+  <span class="green">bogus_noparent</span>
+<strong><span class="white">$ git nav-downstream</span></strong>
+
+Please select a downstream branch
+  0. cool_feature
+  1. frozen_changes
+  2. master
+Selection (0-2)[0]: 0
+<strong><span class="white">$ git map-branches</span></strong>
+<span class="red">origin/master</span>
+  <strong><span class="aqua">cool_feature *&#8203;</span></strong>
+    <span class="green">subfeature</span>
+  <span class="green">frozen_changes</span>
+  <span class="green">master</span>
+<span class="fuchsia">{NO UPSTREAM}</span>
+  <span class="green">bogus_noparent</span></code></pre>
+</div></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div>
+<div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-upstream.html">git-nav-upstream(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 depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 14:24:49 PDT
 </div>
 </div>
 </body>
diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-nav-upstream.html
similarity index 88%
copy from git_docs/htmlout/git-thaw.html
copy to docs/html/git-nav-upstream.html
index cc2683a..bfe08f8 100644
--- a/git_docs/htmlout/git-thaw.html
+++ b/docs/html/git-nav-upstream.html
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
 <meta name="generator" content="AsciiDoc 8.6.9" />
-<title>git-thaw(1)</title>
+<title>git-nav-upstream(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -734,12 +741,12 @@
 <body class="manpage">
 <div id="header">
 <h1>
-git-thaw(1) Manual Page
+git-nav-upstream(1) Manual Page
 </h1>
 <h2>NAME</h2>
 <div class="sectionbody">
-<p>git-thaw -
-   Un-freeze all changes on a frozen branch.
+<p>git-nav-upstream -
+   Checkout the upstream branch of the currently checked out branch.
 </p>
 </div>
 </div>
@@ -748,7 +755,7 @@
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git thaw</em></pre>
+<pre class="content"><em>git nav-upstream</em></pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -756,31 +763,54 @@
 <div class="sect1">
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><code>git thaw</code> takes a frozen branch (as made by <a href="git-freeze.html">git-freeze(1)</a>), and returns
-it to the status that it was in before it was frozen.</p></div>
-<div class="paragraph"><p>If you freeze a branch multiple times (i.e. change files, freeze, change files,
-freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>
+<div class="paragraph"><p><em>git-nav-upstream</em> takes the current branch, finds it's upstream branch, and
+checks that out.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_example">EXAMPLE</h2>
+<div class="sectionbody">
+<div class="listingblock">
+<div class="content">
+<pre><code><strong><span class="white">$ git map-branches</span></strong>
+<span class="red">origin/master</span>
+  <span class="green">cool_feature</span>
+    <strong><span class="aqua">subfeature *&#8203;</span></strong>
+  <span class="green">frozen_changes</span>
+  <span class="green">master</span>
+<span class="fuchsia">{NO UPSTREAM}</span>
+  <span class="green">bogus_noparent</span>
+<strong><span class="white">$ git nav-upstream</span></strong>
+<strong><span class="white">$ git map-branches</span></strong>
+<span class="red">origin/master</span>
+  <strong><span class="aqua">cool_feature *&#8203;</span></strong>
+    <span class="green">subfeature</span>
+  <span class="green">frozen_changes</span>
+  <span class="green">master</span>
+<span class="fuchsia">{NO UPSTREAM}</span>
+  <span class="green">bogus_noparent</span></code></pre>
+</div></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div>
+<div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-downstream.html">git-nav-downstream(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 depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 14:26:05 PDT
 </div>
 </div>
 </body>
diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-thaw.html
similarity index 96%
rename from git_docs/htmlout/git-thaw.html
rename to docs/html/git-thaw.html
index cc2683a..a568e7d 100644
--- a/git_docs/htmlout/git-thaw.html
+++ b/docs/html/git-thaw.html
@@ -535,6 +535,13 @@
 }
 
 
+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[*/
@@ -771,16 +778,16 @@
 <div class="sect1">
 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Part of the chromium depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-13 17:20:25 PDT
+Last updated 2014-03-14 13:12:40 PDT
 </div>
 </div>
 </body>
diff --git a/docs/man1/depot_tools.1 b/docs/man1/depot_tools.1
new file mode 100644
index 0000000..9834be0
--- /dev/null
+++ b/docs/man1/depot_tools.1
@@ -0,0 +1,77 @@
+'\" t
+.\"     Title: depot_tools
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03/14/2014
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools a57ed8f
+.\"  Language: English
+.\"
+.TH "DEPOT_TOOLS" "1" "03/14/2014" "depot_tools a57ed8f" "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"
+depot_tools \- A collection of tools for dealing with Chromium development\&.
+.SH "DESCRIPTION"
+.sp
+The Chromium depot_tools suite contains many tools to assist/augment the Chromium development environment\&. The tools may be downloaded from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.sp
+There are two primary categories of tools\&. Some of these tools are \fIessential\fR to the development flow, in the sense that you cannot successfully develop Chromium without them\&.
+.sp
+Other tools are merely \fIhelper\fR tools\&. Not required, but they can substantially ease the develpment workflow\&.
+.sp
+A listing of both categories of tools follows\&.
+.SH "HELPER TOOLS"
+.PP
+\fBgit-freeze\fR(1)
+.RS 4
+Freeze all changes on a branch (indexed and unindexed)\&.
+.RE
+.PP
+\fBgit-map-branches\fR(1)
+.RS 4
+Helper script to display all local git branches with \(oqupstream\(cq hierarchy in colorized terminal format\&.
+.RE
+.PP
+\fBgit-map\fR(1)
+.RS 4
+Display history of all branches in a colorized terminal format\&.
+.RE
+.PP
+\fBgit-nav-downstream\fR(1)
+.RS 4
+Checkout a downstream branch of the currently checked out branch\&.
+.RE
+.PP
+\fBgit-nav-upstream\fR(1)
+.RS 4
+Checkout the upstream branch of the currently checked out branch\&.
+.RE
+.PP
+\fBgit-thaw\fR(1)
+.RS 4
+Un\-freeze all changes on a frozen branch\&.
+.RE
+.SH "NOTES"
+.IP " 1." 4
+here
+.RS 4
+\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+.RE
diff --git a/docs/man1/git-freeze.1 b/docs/man1/git-freeze.1
new file mode 100644
index 0000000..03de7cd
--- /dev/null
+++ b/docs/man1/git-freeze.1
@@ -0,0 +1,105 @@
+'\" t
+.\"     Title: git-freeze
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03/14/2014
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools a57ed8f
+.\"  Language: English
+.\"
+.TH "GIT\-FREEZE" "1" "03/14/2014" "depot_tools a57ed8f" "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-freeze \- Freeze all changes on a branch (indexed and unindexed)\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit freeze\fR
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+git freeze works a lot like git stash, in that it stores the current changes in your working copy and index \fIsomewhere\fR\&. Unlike git stash, git freeze stores those changes on your current branch\&. This effectively allows you to \fIpause\fR development of a branch, work on something else, and then come back to exactly the same working state later (by running git thaw)\&.
+.sp
+git freeze will make up to 2 commits on your branch\&. A commit with the message FREEZE\&.indexed will contain all changes which you\(cqve added to your index (like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with the message FREEZE\&.unindexed will contain all changes which were not in your index at the time you ran git freeze (freshly modified files, new files, etc\&.)\&.
+.SH "EXAMPLE"
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB$ git status \-\-short\fR
+A  added_file
+A\:M added_file_with_unstaged_changes
+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 182eccae8e385acba21c9ff2713e98ff4b7e17cd
+Author: Robert Iannucci <iannucci@chromium\&.org>
+Date:   Thu Mar 13 17:42:37 2014 \-0700
+
+    FREEZE\&.unindexed
+
+ added_file_with_unstaged_changes | 3 ++\:\-
+ modified_file                    | 4 +++\:\-
+ unadded_file                     | 3 +++
+ unstaged_deleted_file            | 1 \-
+ 4 files changed, 8 insertions(+), 3 deletions(\-)
+
+commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4
+Author: Robert Iannucci <iannucci@chromium\&.org>
+Date:   Thu Mar 13 17:42:37 2014 \-0700
+
+    FREEZE\&.indexed
+
+ added_file                       | 3 +++
+ added_file_with_unstaged_changes | 1 +
+ deleted_file                     | 1 \-
+ 3 files changed, 4 insertions(+), 1 deletion(\-)
+\fB$ git thaw\fR
+\fB$ git status \-\-short\fR
+A  added_file
+A\:M added_file_with_unstaged_changes
+D  deleted_file
+ M modified_file
+ D unstaged_deleted_file
+?? unadded_file
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "SEE ALSO"
+.sp
+\fBgit-thaw\fR(1)
+.SH "CHROMIUM DEPOT_TOOLS"
+.sp
+Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.SH "NOTES"
+.IP " 1." 4
+here
+.RS 4
+\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+.RE
diff --git a/docs/man1/git-map-branches.1 b/docs/man1/git-map-branches.1
new file mode 100644
index 0000000..1f3236d
--- /dev/null
+++ b/docs/man1/git-map-branches.1
@@ -0,0 +1,162 @@
+'\" t
+.\"     Title: git-map-branches
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03/14/2014
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools a57ed8f
+.\"  Language: English
+.\"
+.TH "GIT\-MAP\-BRANCHES" "1" "03/14/2014" "depot_tools a57ed8f" "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-map-branches \- Helper script to display all local git branches with \(oqupstream\(cq hierarchy in colorized terminal format\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit map\-branches\fR
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+Git map\-branches displays all local branches such that:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Current branch is
+cyan\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+The branch which will be modified with git\-commit is denoted with an asterisk (*) after the name\&.
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Local branches are
+green\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Remote branches are
+red
+(usually, the root of all other branches)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+{NO UPSTREAM}
+is a special placeholder in
+magenta\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Branches which have this as their parent are usually misconfigured, and should be assigned a parent by checking out the branch and running git branch \-\-set\-upstream\-to=<correct parent branch>\&.
+.RE
+.RE
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.sp
+If multiple branches are on the same commit, they will all be cyan\&.
+.sp .5v
+.RE
+.SH "EXAMPLE"
+.sp
+Given the hypothetical demo repo in \fBgit-map\fR(1)\*(Aqs EXAMPLE section, and assuming that the frozen_changes branch was currently checked out, running \fIgit map\-branches\fR would result in an output like:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB$ git map\-branches\fR
+origin/master
+  cool_feature
+    subfeature
+  frozen_changes *
+  master
+{NO UPSTREAM}
+  bogus_noparent
+  duplicate_cool_feature_no_upstream
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "SEE ALSO"
+.sp
+\fBgit-map\fR(1)
+.SH "CHROMIUM DEPOT_TOOLS"
+.sp
+Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.SH "NOTES"
+.IP " 1." 4
+here
+.RS 4
+\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+.RE
diff --git a/docs/man1/git-map.1 b/docs/man1/git-map.1
new file mode 100644
index 0000000..e4921c0
--- /dev/null
+++ b/docs/man1/git-map.1
@@ -0,0 +1,162 @@
+'\" t
+.\"     Title: git-map
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03/14/2014
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools a57ed8f
+.\"  Language: English
+.\"
+.TH "GIT\-MAP" "1" "03/14/2014" "depot_tools a57ed8f" "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-map \- Display history of all branches in a colorized terminal format\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit map\fR [<extra_args>\&...]
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+Git map formats the output of git log \-\-graph from all refs such that:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Current branch is
+cyan\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Local branches are
+green\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Remote branches are
+red\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Tags are
+magenta\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+The currently checked out commit is highlighted with a
+blue background\&.
+.RE
+.sp
+The output is automatically piped through the less pager command, even on windows\&.
+.SH "OPTIONS"
+.PP
+<extra_args>\&...
+.RS 4
+Extra parameters to pass to the internal
+\fBgit-log\fR(1)
+invocation\&. This can be used to restrict what refs
+\fIgit map\fR
+operates on, etc\&.
+.sp
+If you run git map with a series of fixed arguments frequently, you can use the depot_tools\&.map_extra configuration variable to pre\-set arguments (See
+CONFIGURATION VARIABLES)
+.RE
+.SH "CONFIGURATION VARIABLES"
+.SS "depot_tools\&.map_extra"
+.sp
+Each value of the \fIdepot_tools\&.map_extra\fR config variable is applied as an additional argument to git log during the execution of git map\&. If you wish to configure this, use git config \-\-add depot_tools\&.map_extra <value> to do so\&.
+.SH "EXAMPLE"
+.sp
+Running \fIgit map\fR would result in an output something like:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB$ git map\fR
+*\:\fB 7dcfe47       \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unindexed
+* \fB4b0c180\fR        2014\-03\-12 ~ modfile
+* \fB59a7cca\fR        2014\-03\-12 ~ a deleted file
+* \fB6bec695\fR        (\:origin/master\:) 2014\-03\-11 ~ Add neat feature
+* \fBd15a38a\fR        2014\-03\-11 ~ Epic README update
+* \fBd559894\fR        (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream change
+| * \fB9c311fd\fR      (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL comments
+| | * \fB2a1eeb2\fR    (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with CoolService
+| | * \fBd777af6\fR    2014\-03\-11 ~ slick commenting action
+| |/
+| * \fB265803a\fR      2014\-03\-11 ~ another improvement
+| * \fB6d831ac\fR      (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen
+| * \fB82e74ab\fR      2014\-03\-11 ~ Add widget
+|/
+* \fBd08c5b3\fR        (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful beginnings
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.sp
+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 \fIupstream\fR relationships of the branches (i\&.e\&. which branch is tracking which other branch), use the \fBgit-map-branches\fR(1) command\&.
+.SH "SEE ALSO"
+.sp
+\fBgit-map-branches\fR(1)
+.SH "CHROMIUM DEPOT_TOOLS"
+.sp
+Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.SH "NOTES"
+.IP " 1." 4
+here
+.RS 4
+\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+.RE
diff --git a/docs/man1/git-nav-downstream.1 b/docs/man1/git-nav-downstream.1
new file mode 100644
index 0000000..de000e2
--- /dev/null
+++ b/docs/man1/git-nav-downstream.1
@@ -0,0 +1,86 @@
+'\" t
+.\"     Title: git-nav-downstream
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03/14/2014
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools a57ed8f
+.\"  Language: English
+.\"
+.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "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-nav-downstream \- Checkout a downstream branch of the currently checked out branch\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit nav\-downstream\fR
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+\fIgit\-nav\-downstream\fR takes the current branch and discovers all branches downstream of it\&. If there is only one branch downstream of the current branch, the command will check that out\&. If there\*(Aqs more than one downstream branch, the command will prompt you with a selection of the branches\&.
+.SH "EXAMPLE"
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB$ git map\-branches\fR
+\fBorigin/master *\:\fR
+  cool_feature
+    subfeature
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+\fB$ git nav\-downstream\fR
+
+Please select a downstream branch
+  0\&. cool_feature
+  1\&. frozen_changes
+  2\&. master
+Selection (0\-2)[0]: 0
+\fB$ git map\-branches\fR
+origin/master
+  \fBcool_feature *\:\fR
+    subfeature
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "SEE ALSO"
+.sp
+\fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1)
+.SH "CHROMIUM DEPOT_TOOLS"
+.sp
+Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.SH "NOTES"
+.IP " 1." 4
+here
+.RS 4
+\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+.RE
diff --git a/docs/man1/git-nav-upstream.1 b/docs/man1/git-nav-upstream.1
new file mode 100644
index 0000000..6588467
--- /dev/null
+++ b/docs/man1/git-nav-upstream.1
@@ -0,0 +1,80 @@
+'\" t
+.\"     Title: git-nav-upstream
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 03/14/2014
+.\"    Manual: Chromium depot_tools Manual
+.\"    Source: depot_tools a57ed8f
+.\"  Language: English
+.\"
+.TH "GIT\-NAV\-UPSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "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-nav-upstream \- Checkout the upstream branch of the currently checked out branch\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+\fIgit nav\-upstream\fR
+.fi
+.sp
+.SH "DESCRIPTION"
+.sp
+\fIgit\-nav\-upstream\fR takes the current branch, finds it\*(Aqs upstream branch, and checks that out\&.
+.SH "EXAMPLE"
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB$ git map\-branches\fR
+origin/master
+  cool_feature
+    \fBsubfeature *\:\fR
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+\fB$ git nav\-upstream\fR
+\fB$ git map\-branches\fR
+origin/master
+  \fBcool_feature *\:\fR
+    subfeature
+  frozen_changes
+  master
+{NO UPSTREAM}
+  bogus_noparent
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "SEE ALSO"
+.sp
+\fBgit-map-branches\fR(1), \fBgit-nav-downstream\fR(1)
+.SH "CHROMIUM DEPOT_TOOLS"
+.sp
+Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.SH "NOTES"
+.IP " 1." 4
+here
+.RS 4
+\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+.RE
diff --git a/man1/git-thaw.1 b/docs/man1/git-thaw.1
similarity index 83%
rename from man1/git-thaw.1
rename to docs/man1/git-thaw.1
index c9f3cc2..6336483 100644
--- a/man1/git-thaw.1
+++ b/docs/man1/git-thaw.1
@@ -2,12 +2,12 @@
 .\"     Title: git-thaw
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/13/2014
+.\"      Date: 03/14/2014
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools f48b2c2
+.\"    Source: depot_tools a57ed8f
 .\"  Language: English
 .\"
-.TH "GIT\-THAW" "1" "03/13/2014" "depot_tools f48b2c2" "Chromium depot_tools Manual"
+.TH "GIT\-THAW" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@
 \fBgit-freeze\fR(1)
 .SH "CHROMIUM DEPOT_TOOLS"
 .sp
-Part of the chromium depot_tools suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .SH "NOTES"
 .IP " 1." 4
 here
diff --git a/docs/src/.gitignore b/docs/src/.gitignore
new file mode 100644
index 0000000..bcfbbc5
--- /dev/null
+++ b/docs/src/.gitignore
@@ -0,0 +1,2 @@
+git
+__*.txt
\ No newline at end of file
diff --git a/docs/src/_footer.txt b/docs/src/_footer.txt
new file mode 100644
index 0000000..b656239
--- /dev/null
+++ b/docs/src/_footer.txt
@@ -0,0 +1,8 @@
+CHROMIUM DEPOT_TOOLS
+--------------------
+
+Part of the chromium linkgit:depot_tools[1] suite. These tools are meant to
+assist with the development of chromium and related projects. Download the tools
+from link:{sys3:git config remote.origin.url}[here].
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/_git-freeze_desc.helper.txt b/docs/src/_git-freeze_desc.helper.txt
new file mode 100644
index 0000000..7c6bf04
--- /dev/null
+++ b/docs/src/_git-freeze_desc.helper.txt
@@ -0,0 +1 @@
+Freeze all changes on a branch (indexed and unindexed).
diff --git a/docs/src/_git-map-branches_desc.helper.txt b/docs/src/_git-map-branches_desc.helper.txt
new file mode 100644
index 0000000..e6bb086
--- /dev/null
+++ b/docs/src/_git-map-branches_desc.helper.txt
@@ -0,0 +1,4 @@
+Helper script to display all local git branches with ‘upstream’ hierarchy in
+colorized terminal format.
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/_git-map_desc.helper.txt b/docs/src/_git-map_desc.helper.txt
new file mode 100644
index 0000000..9194b85
--- /dev/null
+++ b/docs/src/_git-map_desc.helper.txt
@@ -0,0 +1,3 @@
+Display history of all branches in a colorized terminal format.
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/_git-nav-downstream_desc.helper.txt b/docs/src/_git-nav-downstream_desc.helper.txt
new file mode 100644
index 0000000..93d28a9
--- /dev/null
+++ b/docs/src/_git-nav-downstream_desc.helper.txt
@@ -0,0 +1 @@
+Checkout a downstream branch of the currently checked out branch.
diff --git a/docs/src/_git-nav-upstream_desc.helper.txt b/docs/src/_git-nav-upstream_desc.helper.txt
new file mode 100644
index 0000000..eab18e7
--- /dev/null
+++ b/docs/src/_git-nav-upstream_desc.helper.txt
@@ -0,0 +1 @@
+Checkout the upstream branch of the currently checked out branch.
diff --git a/docs/src/_git-thaw_desc.helper.txt b/docs/src/_git-thaw_desc.helper.txt
new file mode 100644
index 0000000..106d117
--- /dev/null
+++ b/docs/src/_git-thaw_desc.helper.txt
@@ -0,0 +1,2 @@
+Un-freeze all changes on a frozen branch.
+
diff --git a/docs/src/asciidoc-override.css b/docs/src/asciidoc-override.css
new file mode 100644
index 0000000..956e35f
--- /dev/null
+++ b/docs/src/asciidoc-override.css
@@ -0,0 +1,7 @@
+div.listingblock > div.content {
+  background: rgb(28, 28, 28);
+}
+
+div.listingblock > div > pre > code {
+  color: rgb(187, 187, 187);
+}
diff --git a/docs/src/depot_tools.txt b/docs/src/depot_tools.txt
new file mode 100644
index 0000000..7ae4dd2
--- /dev/null
+++ b/docs/src/depot_tools.txt
@@ -0,0 +1,28 @@
+depot_tools(1)
+==============
+
+NAME
+----
+depot_tools - A collection of tools for dealing with Chromium development.
+
+DESCRIPTION
+-----------
+
+The Chromium depot_tools suite contains many tools to assist/augment the
+Chromium development environment. The tools may be downloaded from
+link:{sys3:git config remote.origin.url}[here].
+
+There are two primary categories of tools. Some of these tools are 'essential'
+to the development flow, in the sense that you cannot successfully develop
+Chromium without them.
+
+Other tools are merely 'helper' tools. Not required, but they can substantially
+ease the develpment workflow.
+
+A listing of both categories of tools follows.
+
+include::__essential.txt[maxdepth=1]
+
+include::__helper.txt[maxdepth=1]
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/git-freeze.txt b/docs/src/git-freeze.txt
new file mode 100644
index 0000000..4aaa7e1
--- /dev/null
+++ b/docs/src/git-freeze.txt
@@ -0,0 +1,82 @@
+git-freeze(1)
+=============
+
+NAME
+----
+git-freeze -
+include::_git-freeze_desc.helper.txt[]
+
+SYNOPSIS
+--------
+[verse]
+'git freeze'
+
+DESCRIPTION
+-----------
+
+`git freeze` works a lot like `git stash`, in that it stores the current changes
+in your working copy and index 'somewhere'. Unlike `git stash`, `git freeze`
+stores those changes on your current branch. This effectively allows you to
+'pause' development of a branch, work on something else, and then come back to
+exactly the same working state later (by running `git thaw`).
+
+`git freeze` will make up to 2 commits on your branch. A commit with the message
+`FREEZE.indexed` will contain all changes which you’ve added to your index (like
+with 'git add', 'git mv', 'git rm', etc.). A commit with the message
+`FREEZE.unindexed` will contain all changes which were not in your index at the
+time you ran git freeze (freshly modified files, new files, etc.).
+
+EXAMPLE
+-------
+
+[subs="specialcharacters,quotes,attributes"]
+----
+[white]**$ git status --short**
+[green]##A##  added_file
+[green]##A##{zwsp}[red]##M## added_file_with_unstaged_changes
+[green]##D##  deleted_file
+ [red]##M## modified_file
+ [red]##D## unstaged_deleted_file
+[red]##??## unadded_file
+[white]**$ git freeze**
+[white]**$ git status --short**
+[white]**$ git log -n 2 --stat**
+[yellow]##commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd##
+Author: Robert Iannucci <iannucci@chromium.org>
+Date:   Thu Mar 13 17:42:37 2014 -0700
+
+    FREEZE.unindexed
+
+ added_file_with_unstaged_changes | 3 [green]##\+\+##{zwsp}[red]##-##
+ modified_file                    | 4 [green]##\+\+\+##{zwsp}[red]##-##
+ unadded_file                     | 3 [green]##\+\+\+##
+ unstaged_deleted_file            | 1 [red]##-##
+ 4 files changed, 8 insertions(\+), 3 deletions(-)
+
+[yellow]##commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4##
+Author: Robert Iannucci <iannucci@chromium.org>
+Date:   Thu Mar 13 17:42:37 2014 -0700
+
+    FREEZE.indexed
+
+ added_file                       | 3 [green]##\+\+\+##
+ added_file_with_unstaged_changes | 1 [green]##\+##
+ deleted_file                     | 1 [red]##-##
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+[white]**$ git thaw**
+[white]**$ git status --short**
+[green]##A##  added_file
+[green]##A##{zwsp}[red]##M## added_file_with_unstaged_changes
+[green]##D##  deleted_file
+ [red]##M## modified_file
+ [red]##D## unstaged_deleted_file
+[red]##??## unadded_file
+----
+
+SEE ALSO
+--------
+linkgit:git-thaw[1]
+
+include::_footer.txt[]
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/git-map-branches.txt b/docs/src/git-map-branches.txt
new file mode 100644
index 0000000..21bf072
--- /dev/null
+++ b/docs/src/git-map-branches.txt
@@ -0,0 +1,57 @@
+git-map-branches(1)
+===================
+
+NAME
+----
+git-map-branches -
+include::_git-map-branches_desc.helper.txt[]
+
+SYNOPSIS
+--------
+[verse]
+'git map-branches'
+
+DESCRIPTION
+-----------
+
+Git map-branches displays all local branches such that:
+
+* Current branch is [aqua]#cyan#.
+** The branch which will be modified with git-commit is denoted with an asterisk
+	 (`*`) after the name.
+* Local branches are [green]#green#.
+* Remote branches are [red]#red# (usually, the root of all other branches).
+* `{NO UPSTREAM}` is a special placeholder in [fuchsia]#magenta#.
+** Branches which have this as their parent are usually misconfigured, and
+	 should be assigned a parent by checking out the branch and running git branch
+	 --set-upstream-to=<correct parent branch>.
+
+NOTE: If multiple branches are on the same commit, they will all be cyan.
+
+EXAMPLE
+-------
+
+Given the hypothetical demo repo in linkgit:git-map[1]\'s EXAMPLE section, and
+assuming that the `frozen_changes` branch was currently checked out, running
+'git map-branches' would result in an output like:
+
+[subs="quotes"]
+----
+[white]**$ git map-branches**
+[red]#origin/master#
+  [green]#cool_feature#
+    [green]#subfeature#
+  [aqua]#frozen_changes *#
+  [green]#master#
+[fuchsia]#{NO UPSTREAM}#
+  [green]#bogus_noparent#
+  [aqua]#duplicate_cool_feature_no_upstream#
+----
+
+SEE ALSO
+--------
+linkgit:git-map[1]
+
+include::_footer.txt[]
+
+// vim: ft=asciidoc noexpandtab:
\ No newline at end of file
diff --git a/docs/src/git-map.txt b/docs/src/git-map.txt
new file mode 100644
index 0000000..8b22f3a
--- /dev/null
+++ b/docs/src/git-map.txt
@@ -0,0 +1,85 @@
+git-map(1)
+==========
+
+NAME
+----
+git-map -
+include::_git-map_desc.helper.txt[]
+
+SYNOPSIS
+--------
+[verse]
+'git map' [<extra_args>...]
+
+DESCRIPTION
+-----------
+
+Git map formats the output of `git log --graph` from all refs such that:
+
+* Current branch is [aqua]#cyan#.
+* Local branches are [green]#green#.
+* Remote branches are [red]#red#.
+* Tags are [fuchsia]#magenta#.
+* The currently checked out commit is highlighted with a [yellow blue-background]#blue background#.
+
+The output is automatically piped through the `less` pager command, even on
+windows.
+
+OPTIONS
+-------
+<extra_args>...::
+	Extra parameters to pass to the internal linkgit:git-log[1] invocation. This
+	can be used to restrict what refs 'git map' operates on, etc.
++
+If you run git map with a series of fixed arguments frequently, you can use
+the depot_tools.map_extra configuration variable to pre-set arguments (See
+`CONFIGURATION VARIABLES`)
+
+
+CONFIGURATION VARIABLES
+-----------------------
+
+depot_tools.map_extra
+~~~~~~~~~~~~~~~~~~~~~
+
+Each value of the 'depot_tools.map_extra' config variable is applied as an
+additional argument to `git log` during the execution of git map. If you wish to
+configure this, use git `config --add depot_tools.map_extra <value>` to do so.
+
+EXAMPLE
+-------
+
+Running 'git map' would result in an output something like:
+
+[subs="quotes,attributes"]
+----
+[white]**$ git map**
+[white blue-background]##*##{zwsp}[blue-background red]** 7dcfe47       ** [green]##(##{zwsp}[aqua]**frozen_changes**{zwsp}[green]##)## [yellow]##2014-03-12## \~ FREEZE.unindexed
+* [red]**4b0c180**        [yellow]##2014-03-12## \~ modfile
+* [red]**59a7cca**        [yellow]##2014-03-12## \~ a deleted file
+* [red]**6bec695**        [green]##(##{zwsp}[red]##origin/master##{zwsp}[green]##)## [yellow]##2014-03-11## \~ Add neat feature
+* [red]**d15a38a**        [yellow]##2014-03-11## \~ Epic README update
+* [red]**d559894**        [green]##(##{zwsp}[lime]**master**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Important upstream change
+[red]##|## * [red]**9c311fd**      [green]##(##{zwsp}[lime]**cool_feature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Respond to CL comments
+[red]##|## [green]##|## * [red]**2a1eeb2**    [green]##(##{zwsp}[lime]**subfeature**{zwsp}[green]##)## [yellow]##2014-03-11## \~ integrate with CoolService
+[red]##|## [green]##|## * [red]**d777af6**    [yellow]##2014-03-11## \~ slick commenting action
+[red]##|## [green]##|/##
+[red]##|## * [red]**265803a**      [yellow]##2014-03-11## \~ another improvement
+[red]##|## * [red]**6d831ac**      [green]##(##{zwsp}[fuchsia]**spleen_tag**{zwsp}[green]##)## [yellow]##2014-03-11## \~ Refactor spleen
+[red]##|## * [red]**82e74ab**      [yellow]##2014-03-11## \~ Add widget
+[red]##|/##
+* [red]**d08c5b3**        [green]##(##{zwsp}[lime]**bogus_noparent**{zwsp}[green]##)## [yellow]##2014-03-11## ~ Wonderful beginnings
+----
+
+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 'upstream'
+relationships of the branches (i.e. which branch is tracking which other
+branch), use the linkgit:git-map-branches[1] command.
+
+SEE ALSO
+--------
+linkgit:git-map-branches[1]
+
+include::_footer.txt[]
+
+// vim: ft=asciidoc noexpandtab:
\ No newline at end of file
diff --git a/docs/src/git-nav-downstream.txt b/docs/src/git-nav-downstream.txt
new file mode 100644
index 0000000..d76b6dc
--- /dev/null
+++ b/docs/src/git-nav-downstream.txt
@@ -0,0 +1,58 @@
+git-nav-downstream(1)
+=====================
+
+NAME
+----
+git-nav-downstream -
+include::_git-nav-downstream_desc.helper.txt[]
+
+SYNOPSIS
+--------
+[verse]
+'git nav-downstream'
+
+DESCRIPTION
+-----------
+
+'git-nav-downstream' takes the current branch and discovers all branches
+downstream of it. If there is only one branch downstream of the current branch,
+the command will check that out. If there\'s more than one downstream branch, the
+command will prompt you with a selection of the branches.
+
+EXAMPLE
+-------
+
+[subs="quotes,attributes"]
+----
+[white]**$ git map-branches**
+[red]**origin/master *{zwsp}**
+  [green]#cool_feature#
+    [green]#subfeature#
+  [green]#frozen_changes#
+  [green]#master#
+[fuchsia]#{NO UPSTREAM}#
+  [green]#bogus_noparent#
+[white]**$ git nav-downstream**
+
+Please select a downstream branch
+  0. cool_feature
+  1. frozen_changes
+  2. master
+Selection (0-2)[0]: 0
+[white]**$ git map-branches**
+[red]##origin/master##
+  [aqua]**cool_feature *{zwsp}**
+    [green]#subfeature#
+  [green]#frozen_changes#
+  [green]#master#
+[fuchsia]#{NO UPSTREAM}#
+  [green]#bogus_noparent#
+----
+
+SEE ALSO
+--------
+linkgit:git-map-branches[1], linkgit:git-nav-upstream[1]
+
+include::_footer.txt[]
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/git-nav-upstream.txt b/docs/src/git-nav-upstream.txt
new file mode 100644
index 0000000..1f09a8b
--- /dev/null
+++ b/docs/src/git-nav-upstream.txt
@@ -0,0 +1,50 @@
+git-nav-upstream(1)
+=====================
+
+NAME
+----
+git-nav-upstream -
+include::_git-nav-upstream_desc.helper.txt[]
+
+SYNOPSIS
+--------
+[verse]
+'git nav-upstream'
+
+DESCRIPTION
+-----------
+
+'git-nav-upstream' takes the current branch, finds it\'s upstream branch, and
+checks that out.
+
+EXAMPLE
+-------
+
+[subs="quotes,attributes"]
+----
+[white]**$ git map-branches**
+[red]##origin/master##
+  [green]#cool_feature#
+    [aqua]**subfeature *{zwsp}**
+  [green]#frozen_changes#
+  [green]#master#
+[fuchsia]#{NO UPSTREAM}#
+  [green]#bogus_noparent#
+[white]**$ git nav-upstream**
+[white]**$ git map-branches**
+[red]##origin/master##
+  [aqua]**cool_feature *{zwsp}**
+    [green]#subfeature#
+  [green]#frozen_changes#
+  [green]#master#
+[fuchsia]#{NO UPSTREAM}#
+  [green]#bogus_noparent#
+----
+
+SEE ALSO
+--------
+linkgit:git-map-branches[1], linkgit:git-nav-downstream[1]
+
+include::_footer.txt[]
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/git_docs/git-thaw.txt b/docs/src/git-thaw.txt
similarity index 83%
rename from git_docs/git-thaw.txt
rename to docs/src/git-thaw.txt
index feb447d..5c1d205 100644
--- a/git_docs/git-thaw.txt
+++ b/docs/src/git-thaw.txt
@@ -3,7 +3,8 @@
 
 NAME
 ----
-git-thaw - Un-freeze all changes on a frozen branch.
+git-thaw -
+include::_git-thaw_desc.helper.txt[]
 
 SYNOPSIS
 --------
@@ -24,3 +25,5 @@
 linkgit:git-freeze[1]
 
 include::_footer.txt[]
+
+// vim: ft=asciidoc noexpandtab:
diff --git a/docs/src/make_docs.sh b/docs/src/make_docs.sh
new file mode 100755
index 0000000..c64992c
--- /dev/null
+++ b/docs/src/make_docs.sh
@@ -0,0 +1,180 @@
+#!/bin/bash -e
+shopt -s nullglob
+
+cd $(dirname "$0")
+
+# Script which takes all the asciidoc git-*.txt files in this directory, renders
+# them to html + manpage format using git 1.9's doc toolchain, then puts
+# them in depot_tools to be committed.
+
+ensure_in_path() {
+  local CMD=$1
+  local PTH=$(which "$CMD")
+  if [[ ! $PTH ]]
+  then
+    echo Must have "$CMD" on your PATH!
+    exit 1
+  else
+    echo Using \'$PTH\' for ${CMD}.
+  fi
+}
+
+ensure_in_path xmlto
+ensure_in_path asciidoc
+
+DFLT_CATALOG_PATH="/usr/local/etc/xml/catalog"
+if [[ ! $XML_CATALOG_FILES && -f "$DFLT_CATALOG_PATH" ]]
+then
+  # Default if you install doctools with homebrew on mac
+  export XML_CATALOG_FILES="$DFLT_CATALOG_PATH"
+  echo Using \'$DFLT_CATALOG_PATH\' for \$XML_CATALOG_FILES.
+fi
+
+# We pull git to get its documentation toolchain
+BRANCH=v1.9.0
+GITHASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac
+if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
+then
+  echo Cloning git
+  rm -rf git
+  git clone --single-branch --branch $BRANCH --depth 1 \
+    https://kernel.googlesource.com/pub/scm/git/git.git  2> /dev/null
+
+  # Replace the 'source' and 'package' strings.
+  ed git/Documentation/asciidoc.conf <<EOF
+H
+81
+s/Git/depot_tools
++2
+s/Git Manual/Chromium depot_tools Manual
+wq
+EOF
+
+  # fix Makefile to include non-_-prefixed files as MAN1 entries
+  {
+    shopt -s extglob
+    echo H
+    echo 16
+    for x in "$(echo !(git-*|_*).txt)"
+    do
+      echo i
+      echo MAN1_TXT += $x
+      echo .
+    done
+    echo wq
+  } | ed git/Documentation/Makefile
+
+  # fix build-docdep.perl to ignore attributes on include::[] macros
+  ed git/Documentation/build-docdep.perl <<EOF
+H
+12
+c
+	    s/\[[^]]*\]//;
+.
+wq
+EOF
+
+  # Add additional CSS override file
+  ed git/Documentation/Makefile <<EOF
+H
+/ASCIIDOC_EXTRA
+a
+ -a stylesheet=$(pwd)/git/Documentation/asciidoc-override.css
+.
+-1
+j
+/^\$(MAN_HTML):
+a
+ asciidoc-override.css
+.
+-1
+j
+wq
+EOF
+
+fi
+echo Git up to date at $GITHASH \($BRANCH\)
+
+# build directory files for 'essential' and 'helper' sections of the depot_tools
+# manpage.
+for category in helper essential
+do
+  {
+    PRINTED_BANNER=0
+    for x in *.${category}.txt
+    do
+      # If we actually have tools in the category, print the banner first.
+      if [[ $PRINTED_BANNER != 1 ]]
+      then
+        PRINTED_BANNER=1
+        # ex.
+        # CATEGORY TOOLS
+        # --------------
+        BANNER=$(echo $category tools | awk '{print toupper($0)}')
+        echo $BANNER
+        for i in $(seq 1 ${#BANNER})
+        do
+          echo -n -
+        done
+        echo
+        echo
+      fi
+
+      # ex.
+      # linkgit:git-tool[1]::
+      # \tinclude::_git-tool_desc.category.txt[]
+      PLAIN_PATH=${x%%_desc.*.txt}
+      PLAIN_PATH=${PLAIN_PATH:1}
+      echo "linkgit:$PLAIN_PATH[1]::"
+      echo -e "include::${x}[]"
+      echo
+    done
+  } > __${category}.txt
+done
+
+HTML_TARGETS=()
+MAN_TARGETS=()
+for x in *.txt *.css
+do
+  TO="git/Documentation/$x"
+  if [[ ! -f "$TO" ]] || ! cmp --silent "$x" "$TO"
+  then
+    echo \'$x\' differs
+    cp $x "$TO"
+  fi
+  # Exclude files beginning with _ from the target list. This is useful to have
+  # includable snippet files.
+  if [[ ${x:0:1} != _ && ${x:(-4)} == .txt ]]
+  then
+    HTML_TARGETS+=("${x%%.txt}.html")
+    MAN_TARGETS+=("${x%%.txt}.1")
+  fi
+done
+
+VER="v$(git rev-parse --short HEAD)"
+if [[ ! -f git/version ]] || ! cmp --silent git/version <(echo "$VER")
+then
+  echo Version changed, cleaning.
+  echo "$VER" > git/version
+  (cd git/Documentation && make clean)
+fi
+
+# This export is so that asciidoc sys snippets which invoke git run relative to
+# depot_tools instead of the git clone.
+(
+  export GIT_DIR="$(git rev-parse --git-dir)" &&
+  cd git/Documentation &&
+  make -j"$[${#MAN_TARGETS} + ${#HTML_TARGETS}]" "${MAN_TARGETS[@]}" "${HTML_TARGETS[@]}"
+)
+
+for x in "${HTML_TARGETS[@]}"
+do
+  echo Copying ../html/$x
+  tr -d '\015' <"git/Documentation/$x"  >"../html/$x"
+done
+
+for x in "${MAN_TARGETS[@]}"
+do
+  echo Copying ../man1/$x
+  cp "git/Documentation/$x" ../man1
+done
\ No newline at end of file
diff --git a/git_docs/.gitignore b/git_docs/.gitignore
deleted file mode 100644
index 0899c29..0000000
--- a/git_docs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-git
\ No newline at end of file
diff --git a/git_docs/_footer.txt b/git_docs/_footer.txt
deleted file mode 100644
index a4681bc..0000000
--- a/git_docs/_footer.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-CHROMIUM DEPOT_TOOLS
---------------------
-Part of the chromium depot_tools suite. These tools are meant to assist with the
-development of chromium and related projects. Download the tools from
-link:{sys3:git config remote.origin.url}[here].
diff --git a/git_docs/git-freeze.txt b/git_docs/git-freeze.txt
deleted file mode 100644
index 62f6bf4..0000000
--- a/git_docs/git-freeze.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-git-freeze(1)
-=============
-
-NAME
-----
-git-freeze - Freeze all changes on a branch (indexed and unindexed)
-
-SYNOPSIS
---------
-[verse]
-'git freeze'
-
-DESCRIPTION
------------
-
-`git freeze` works a lot like `git stash`, in that it stores the current changes
-in your working copy and index 'somewhere'. Unlike `git stash`, `git freeze`
-stores those changes on your current branch. This effectively allows you to
-'pause' development of a branch, work on something else, and then come back to
-exactly the same working state later (by running `git thaw`).
-
-`git freeze` will make up to 2 commits on your branch. A commit with the message
-`FREEZE.indexed` will contain all changes which you’ve added to your index (like
-with 'git add', 'git mv', 'git rm', etc.). A commit with the message
-`FREEZE.unindexed` will contain all changes which were not in your index at the
-time you ran git freeze (freshly modified files, new files, etc.).
-
-SEE ALSO
---------
-linkgit:git-thaw[1]
-
-include::_footer.txt[]
diff --git a/git_docs/make_docs.sh b/git_docs/make_docs.sh
deleted file mode 100755
index efde5d8..0000000
--- a/git_docs/make_docs.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash -e
-shopt -s nullglob
-
-cd $(dirname "$0")
-
-# Script which takes all the asciidoc git-*.txt files in this directory, renders
-# them to html + manpage format using git 1.9's doc toolchain, then puts
-# them in depot_tools to be committed.
-
-ensure_in_path() {
-  local CMD=$1
-  local PTH=$(which "$CMD")
-  if [[ ! $PTH ]]
-  then
-    echo Must have "$CMD" on your PATH!
-    exit 1
-  else
-    echo Using \'$PTH\' for ${CMD}.
-  fi
-}
-
-ensure_in_path xmlto
-ensure_in_path asciidoc
-
-DFLT_CATALOG_PATH="/usr/local/etc/xml/catalog"
-if [[ ! $XML_CATALOG_FILES && -f "$DFLT_CATALOG_PATH" ]]
-then
-  # Default if you install doctools with homebrew on mac
-  export XML_CATALOG_FILES="$DFLT_CATALOG_PATH"
-  echo Using \'$DFLT_CATALOG_PATH\' for \$XML_CATALOG_FILES.
-fi
-
-# We pull git to get its documentation toolchain
-BRANCH=v1.9.0
-GITHASH=5f95c9f850b19b368c43ae399cc831b17a26a5ac
-if [[ ! -d git || $(git -C git rev-parse HEAD) != $GITHASH ]]
-then
-  echo Cloning git
-  rm -rf git
-  git clone --single-branch --branch $BRANCH --depth 1 \
-    https://kernel.googlesource.com/pub/scm/git/git.git  2> /dev/null
-
-  # Replace the 'source' and 'package' strings.
-  ed git/Documentation/asciidoc.conf <<EOF
-  H
-  81
-  s/Git/depot_tools
-  +2
-  s/Git Manual/Chromium depot_tools Manual
-  wq
-EOF
-fi
-echo Git up to date at $GITHASH \($BRANCH\)
-
-HTML_TARGETS=()
-MAN_TARGETS=()
-for x in *.txt
-do
-  TO="git/Documentation/$x"
-  if [[ ! -f "$TO" ]] || ! cmp --silent "$x" "$TO"
-  then
-    echo \'$x\' differs
-    cp $x "$TO"
-  fi
-  # Exclude files beginning with _ from the target list. This is useful to have
-  # includable snippet files.
-  if [[ ${x:0:1} != _ ]]
-  then
-    HTML_TARGETS+=("${x%%.txt}.html")
-    MAN_TARGETS+=("${x%%.txt}.1")
-  fi
-done
-
-VER="v$(git rev-parse --short HEAD)"
-if [[ ! -f git/version ]] || ! cmp --silent git/version <(echo "$VER")
-then
-  echo Version changed, cleaning.
-  echo "$VER" > git/version
-  (cd git/Documentation && make clean)
-fi
-
-# This export is so that asciidoc sys snippets which invoke git run relative to
-# depot_tools instead of the git clone.
-(
-  export GIT_DIR="$(git rev-parse --git-dir)" &&
-  cd git/Documentation &&
-  make -j"$[${#MAN_TARGETS} + ${#HTML_TARGETS}]" "${MAN_TARGETS[@]}" "${HTML_TARGETS[@]}"
-)
-
-mkdir htmlout 2> /dev/null || true
-for x in "${HTML_TARGETS[@]}"
-do
-  echo Copying htmlout/$x
-  cp "git/Documentation/$x" htmlout
-done
-
-for x in "${MAN_TARGETS[@]}"
-do
-  echo Copying ../man1/$x
-  cp "git/Documentation/$x" ../man1
-done
\ No newline at end of file
diff --git a/man1/git-freeze.1 b/man1/git-freeze.1
deleted file mode 100644
index 22a33b7..0000000
--- a/man1/git-freeze.1
+++ /dev/null
@@ -1,54 +0,0 @@
-'\" t
-.\"     Title: git-freeze
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/13/2014
-.\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools f48b2c2
-.\"  Language: English
-.\"
-.TH "GIT\-FREEZE" "1" "03/13/2014" "depot_tools f48b2c2" "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-freeze \- Freeze all changes on a branch (indexed and unindexed)
-.SH "SYNOPSIS"
-.sp
-.nf
-\fIgit freeze\fR
-.fi
-.sp
-.SH "DESCRIPTION"
-.sp
-git freeze works a lot like git stash, in that it stores the current changes in your working copy and index \fIsomewhere\fR\&. Unlike git stash, git freeze stores those changes on your current branch\&. This effectively allows you to \fIpause\fR development of a branch, work on something else, and then come back to exactly the same working state later (by running git thaw)\&.
-.sp
-git freeze will make up to 2 commits on your branch\&. A commit with the message FREEZE\&.indexed will contain all changes which you\(cqve added to your index (like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with the message FREEZE\&.unindexed will contain all changes which were not in your index at the time you ran git freeze (freshly modified files, new files, etc\&.)\&.
-.SH "SEE ALSO"
-.sp
-\fBgit-thaw\fR(1)
-.SH "CHROMIUM DEPOT_TOOLS"
-.sp
-Part of the chromium depot_tools suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.SH "NOTES"
-.IP " 1." 4
-here
-.RS 4
-\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
-.RE