| Index: docs/html/git-new-branch.html
|
| diff --git a/docs/html/git-new-branch.html b/docs/html/git-new-branch.html
|
| index 8e599e93edef4f7856ee5eed8310b230bd458a16..723a6279aebe610fff5041b3e1cb35b6dc9af6b7 100644
|
| --- a/docs/html/git-new-branch.html
|
| +++ b/docs/html/git-new-branch.html
|
| @@ -830,44 +830,48 @@ defaults to <em>origin/master</em>. This is considered to be the <em>root</em>
|
| <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>
|
| - <span class="green">subfeature</span>
|
| - <span class="aqua">frozen_changes *</span>
|
| -<strong><span class="white">$ git new-branch independent_cl</span></strong>
|
| -<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="green">frozen_changes</span>
|
| - <span class="aqua">independent_cl *</span>
|
| -<strong><span class="white">$ git new-branch --upstream subfeature nested_cl</span></strong>
|
| -<strong><span class="white">$ git map-branches</span></strong>
|
| -<span class="red">origin/master</span>
|
| - <span class="green">cool_feature</span>
|
| - <span class="aqua">subfeature</span> <b><1></b>
|
| - <span class="aqua">nested_cl *</span>
|
| - <span class="green">frozen_changes</span>
|
| - <span class="green">independent_cl</span>
|
| -<strong><span class="white">$ git checkout cool_feature</span></strong>
|
| -<strong><span class="white">$ git new-branch --upstream_current cl_depends_on_cool_feature</span></strong>
|
| -<strong><span class="white">$ git map-branches</span></strong>
|
| -<span class="red">origin/master</span>
|
| - <span class="aqua">cool_feature</span>
|
| - <span class="aqua">cl_depends_on_cool_feature *</span>
|
| - <span class="green">subfeature</span>
|
| - <span class="green">nested_cl</span>
|
| - <span class="green">frozen_changes</span>
|
| - <span class="green">independent_cl</span></code></pre>
|
| -</div></div>
|
| -<div class="colist arabic"><ol>
|
| +<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
|
| +<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
|
| +</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch *
|
| +</span><span style="font-weight: bold; color: #ffffff">$ git new-branch independent_cl</span>
|
| +<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
|
| +<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master
|
| +</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
|
| +</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> independent_cl *
|
| +</span><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream subfeature nested_cl</span>
|
| +<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
|
| +<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature
|
| +</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> subfeature</span> <b><1></b><span>
|
| +</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> nested_cl *
|
| +</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> fixit
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl
|
| +</span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_feature</span>
|
| +Your branch is ahead of 'origin/master' by 4 commits.
|
| + (use "git push" to publish your local commits)
|
| +<span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_current cl_depends_on_cool_feature</span>
|
| +<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
|
| +<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
|
| +</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cool_feature
|
| +</span><span style="font-weight: bold; color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> cl_depends_on_cool_feature *
|
| +</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> subfeature
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> nested_cl
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
|
| +</span><span style="color: #19c518"></span><span style="color: #19c518"> independent_cl</span>
|
| +</code></pre></div></div><p><div class="paragraph"></p></div>
|
| +<div class="olist arabic"><ol class="arabic">
|
| <li>
|
| <p>
|
| Note that both branches are cyan because they are currently the same
|
| -<em>commit</em> object. See <a href=":git-map-branches.html">:git-map-branches(1)</a> for more detail.
|
| +<em>commit</em> object. See <a href="git-map-branches.html">git-map-branches(1)</a> for more detail.
|
| </p>
|
| </li>
|
| </ol></div>
|
| @@ -903,7 +907,7 @@ mnemonic: tb → "track branch"
|
| <div class="sect1">
|
| <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
|
| <div class="sectionbody">
|
| -<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(1)</a> suite. These tools are meant to
|
| +<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>
|
| </div>
|
| @@ -912,7 +916,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-25 15:09:11 PDT
|
| +Last updated 2014-04-10 14:23:11 PDT
|
| </div>
|
| </div>
|
| </body>
|
|
|