docs/html/git-map-branches.html - Issue 200903002: Add documentation for git-map-branches, git-map, git-nav-downstream,

Unified Diff: docs/html/git-map-branches.html

Issue 200903002: Add documentation for git-map-branches, git-map, git-nav-downstream, (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@documentation

Patch Set: rebase Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: docs/html/git-map-branches.html

diff --git a/git_docs/htmlout/git-thaw.html b/docs/html/git-map-branches.html

similarity index 85%

copy from git_docs/htmlout/git-thaw.html

copy to docs/html/git-map-branches.html

index cc2683a5ff8111f639a12341fa5996a907382028..e6d160c7e2425897b46226dc26e17e2848f4991b 100644

--- a/git_docs/htmlout/git-thaw.html

+++ b/docs/html/git-map-branches.html

@@ -4,7 +4,7 @@

<head>

-<title>git-thaw(1)</title>

+<title>git-map-branches(1)</title>

/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

@@ -535,6 +535,13 @@ body.manpage div.sectionbody {

}

+div.listingblock > div.content {

+ background: rgb(28, 28, 28);

+div.listingblock > div > pre > code {

+ color: rgb(187, 187, 187);

</style>

/*<![CDATA[*/

@@ -734,12 +741,12 @@ asciidoc.install();

<h1>

-git-thaw(1) Manual Page

+git-map-branches(1) Manual Page

</h1>

-<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>

@@ -748,7 +755,7 @@ git-thaw(1) Manual Page

<h2 id="_synopsis">SYNOPSIS</h2>

-<pre class="content"><em>git thaw</em></pre>

+<pre class="content"><em>git map-branches</em></pre>

</div></div>

</div>

@@ -756,31 +763,95 @@ git-thaw(1) Manual Page

<h2 id="_description">DESCRIPTION</h2>

-<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=<correct parent branch>.

+</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 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 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>

<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>

-<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>

-Last updated 2014-03-13 17:20:25 PDT

+Last updated 2014-03-14 14:01:10 PDT

</div>

</body>

« no previous file with comments | « docs/html/git-map.html ('k') | docs/html/git-nav-downstream.html » ('j') | no next file with comments »