Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: docs/html/git-nav-upstream.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
« no previous file with comments | « docs/html/git-nav-downstream.html ('k') | docs/html/git-thaw.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/html/git-nav-upstream.html
diff --git a/git_docs/htmlout/git-freeze.html b/docs/html/git-nav-upstream.html
similarity index 89%
rename from git_docs/htmlout/git-freeze.html
rename to docs/html/git-nav-upstream.html
index 3f1abf51637c0fcf29534839ec0d635dc48a7a98..bfe08f8707b62a02a986a6aff09a8af0fc0183b4 100644
--- a/git_docs/htmlout/git-freeze.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-freeze(1)</title>
+<title>git-nav-upstream(1)</title>
<style type="text/css">
/* 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>
<script type="text/javascript">
/*<![CDATA[*/
@@ -734,12 +741,12 @@ asciidoc.install();
<body class="manpage">
<div id="header">
<h1>
-git-freeze(1) Manual Page
+git-nav-upstream(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
-<p>git-freeze -
- Freeze all changes on a branch (indexed and unindexed)
+<p>git-nav-upstream -
+ Checkout the upstream branch of the currently checked out branch.
</p>
</div>
</div>
@@ -748,7 +755,7 @@ git-freeze(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git freeze</em></pre>
+<pre class="content"><em>git nav-upstream</em></pre>
<div class="attribution">
</div></div>
</div>
@@ -756,37 +763,54 @@ git-freeze(1) Manual Page
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p><code>git freeze</code> works a lot like <code>git stash</code>, in that it stores the current changes
-in your working copy and index <em>somewhere</em>. Unlike <code>git stash</code>, <code>git freeze</code>
-stores those changes on your current branch. This effectively allows you to
-<em>pause</em> development of a branch, work on something else, and then come back to
-exactly the same working state later (by running <code>git thaw</code>).</p></div>
-<div class="paragraph"><p><code>git freeze</code> will make up to 2 commits on your branch. A commit with the message
-<code>FREEZE.indexed</code> will contain all changes which you’ve added to your index (like
-with <em>git add</em>, <em>git mv</em>, <em>git rm</em>, etc.). A commit with the message
-<code>FREEZE.unindexed</code> will contain all changes which were not in your index at the
-time you ran git freeze (freshly modified files, new files, etc.).</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-thaw.html">git-thaw(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>
« no previous file with comments | « docs/html/git-nav-downstream.html ('k') | docs/html/git-thaw.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698