Index: man/html/git-squash-branch.html |
diff --git a/man/html/git-squash-branch.html b/man/html/git-squash-branch.html |
index ab3a09f8610fdc4cf08df850027081da8b431250..fa341577c1b0f318462088257f1fffb076a55aa4 100644 |
--- a/man/html/git-squash-branch.html |
+++ b/man/html/git-squash-branch.html |
@@ -801,7 +801,7 @@ verify that the conflict diff is what you expected (and then skip it with |
<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="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed |
+* <span style="font-weight: bold; color: #e42e16">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> frozen_branch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed |
* <span style="font-weight: bold; color: #e42e16">f48f415 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile |
* <span style="font-weight: bold; color: #e42e16">4c5b9c0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file |
* <span style="font-weight: bold; color: #e42e16">f7ce1e4 </span><span style="color: #19c518"> (</span><span style="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="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> |
@@ -823,7 +823,7 @@ verify that the conflict diff is what you expected (and then skip it with |
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></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="background-color: #492ee1"></span><span style="font-weight: bold; background-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e16; background-color: #492ee1">98e69e8 </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo |
+* <span style="font-weight: bold; color: #e42e16">98e69e8 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> frozen_branch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ cool squash demo |
* <span style="font-weight: bold; color: #e42e16">f7ce1e4 </span><span style="color: #19c518"> (</span><span style="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="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> |
* <span style="font-weight: bold; color: #e42e16">3726937 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epic README update |
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">14db2e5 </span><span style="color: #19c518"> (</span><span style="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="color: #e7e71c">2014-04-10</span> ~ Respond to CL comments |
@@ -867,14 +867,14 @@ file.</p></div> |
<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 |
-from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div> |
+from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div> |
</div> |
</div> |
</div> |
<div id="footnotes"><hr /></div> |
<div id="footer"> |
<div id="footer-text"> |
-Last updated 2014-04-10 14:23:11 PDT |
+Last updated 2016-07-21 10:09:00 PDT |
</div> |
</div> |
</body> |