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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: docs/html/git-reparent-branch.html

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw
Patch Set: minor fixes 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
« docs/html/git-freeze.html ('K') | « docs/html/git-rename-branch.html ('k') | docs/html/git-squash-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/html/git-reparent-branch.html
diff --git a/docs/html/git-nav-upstream.html b/docs/html/git-reparent-branch.html
similarity index 91%
copy from docs/html/git-nav-upstream.html
copy to docs/html/git-reparent-branch.html
index bfe08f8707b62a02a986a6aff09a8af0fc0183b4..c52401eb192a8e3b59d0ddff1fec49fe7cc2902f 100644
--- a/docs/html/git-nav-upstream.html
+++ b/docs/html/git-reparent-branch.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-nav-upstream(1)</title>
+<title>git-reparent-branch(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -741,12 +741,12 @@ asciidoc.install();
<body class="manpage">
<div id="header">
<h1>
-git-nav-upstream(1) Manual Page
+git-reparent-branch(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
-<p>git-nav-upstream -
- Checkout the upstream branch of the currently checked out branch.
+<p>git-reparent-branch -
+ Alter the parentage (upstream) for the current branch.
</p>
</div>
</div>
@@ -755,7 +755,7 @@ git-nav-upstream(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git nav-upstream</em></pre>
+<pre class="content"><em>git reparent-branch</em> &lt;new_parent&gt;</pre>
<div class="attribution">
</div></div>
</div>
@@ -763,39 +763,34 @@ git-nav-upstream(1) Manual Page
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<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 class="paragraph"><p>Change the <em>upstream</em> of the current branch, and then run
+<a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well
+as the commits in all descendant branches, onto the new parent.</p></div>
+<div class="paragraph"><p><code>&lt;new_parent&gt;</code> may be either a local branch, remote branch, OR a tag (such as
+<code>lkgr</code>).</p></div>
+<div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on
+another CL, or vice versa. This could happen if you started both on the
+assumption that they were independent, but later realized that this was not the
+case.</p></div>
</div>
</div>
<div class="sect1">
-<h2 id="_example">EXAMPLE</h2>
+<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
+file.</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>
- <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>
+<pre><code>[alias]
+ git rp = reparent-branch</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-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-downstream.html">git-nav-downstream(1)</a></p></div>
+<div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)</a>, <a href="git-rename-branch.html">git-rename-branch(1)</a>,
+<a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>
</div>
</div>
<div class="sect1">
@@ -810,7 +805,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:26:05 PDT
+Last updated 2014-03-23 02:13:18 PDT
</div>
</div>
</body>
« docs/html/git-freeze.html ('K') | « docs/html/git-rename-branch.html ('k') | docs/html/git-squash-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')

Powered by Google App Engine
This is Rietveld 408576698