Add git-reup and friends

docs/html/git-map.html

Index: docs/html/git-map.html
diff --git a/docs/html/git-map.html b/docs/html/git-map.html
index 828e1c057695e35234afcc7f22298417c620a40e..02f6274b60c3b2a19601a3b1e684794b90779029 100644
--- a/docs/html/git-map.html
+++ b/docs/html/git-map.html
@@ -787,6 +787,11 @@ Tags are <span class="fuchsia">magenta</span>.
 </li>
 <li>
 <p>
+Merge Base markers are <span class="black-background white">white</span>.
+</p>
+</li>
+<li>
+<p>
 The currently checked out commit is highlighted with a <span class="yellow blue-background">blue background</span>.
 </p>
 </li>
@@ -804,11 +809,11 @@ windows.</p></div>
 </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.
+  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
+the depot-tools.map-extra configuration variable to pre-set arguments (See
 <code>CONFIGURATION VARIABLES</code>)</p></div>
 </dd>
 </dl></div>
@@ -818,10 +823,10 @@ the depot_tools.map_extra configuration variable to pre-set arguments (See
 <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
+<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>
+configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</code> to do so.</p></div>
 </div>
 </div>
 </div>
@@ -835,18 +840,18 @@ configure this, use git <code>config --add depot_tools.map_extra &lt;value&gt;</
 <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">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="white">&lt;(frozen_changes)</span></strong>
 * <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">265803a</span></strong>      <span class="yellow">2014-03-11</span> ~ another improvement    <strong><span class="white">&lt;(subfeature)</span></strong>
 <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>
+* <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    <strong><span class="white">&lt;(cool_feature)</span></strong></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>
@@ -872,7 +877,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-03-14 14:01:55 PDT
+Last updated 2014-03-25 15:09:11 PDT
 </div>
 </div>
 </body>