docs/html/git-reparent-branch.html - Issue 184253003: Add git-reup and friends

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: fix pylint 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-reparent-branch.html

diff --git a/docs/html/git-nav-downstream.html b/docs/html/git-reparent-branch.html

similarity index 88%

copy from docs/html/git-nav-downstream.html

copy to docs/html/git-reparent-branch.html

index da5b5093860a013bb360b469da7beea882b2c417..830dc4c57d09f42bc4c1657ebcbc3a0fc9b31380 100644

--- a/docs/html/git-nav-downstream.html

+++ b/docs/html/git-reparent-branch.html

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

<head>

-<title>git-nav-downstream(1)</title>

+<title>git-reparent-branch(1)</title>

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

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

<h1>

-git-nav-downstream(1) Manual Page

+git-reparent-branch(1) Manual Page

</h1>

-<p>git-nav-downstream -

- Checkout a downstream branch of the currently checked out branch.

+<p>git-reparent-branch -

+ Alter the parentage (upstream) for the current branch.

</p>

</div>

@@ -755,7 +755,9 @@ git-nav-downstream(1) Manual Page

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

-<pre class="content"><em>git nav-downstream</em></pre>

+<pre class="content"><em>git reparent-branch</em> <new_parent>

+<em>git reparent-branch</em> --lkgr

+<em>git reparent-branch</em> --root</pre>

</div></div>

</div>

@@ -763,47 +765,67 @@ git-nav-downstream(1) Manual Page

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

-<div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch and discovers all branches

-downstream of it. If there is only one branch downstream of the current branch,

-the command will check that out. If there's more than one downstream branch, the

-command will prompt you with a selection of the branches.</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><new_parent></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>

-<h2 id="_example">EXAMPLE</h2>

+<h2 id="_options">OPTIONS</h2>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<new_parent>

+</dt>

+<dd>

+<p>

+ The new parent to set as the upstream for this branch. May be a branch ref or

+ a tag.

+</p>

+</dd>

+<dt class="hdlist1">

+--lkgr

+</dt>

+<dd>

+<p>

+ Reparent to track lkgr.

+</p>

+</dd>

+<dt class="hdlist1">

+--root

+</dt>

+<dd>

+<p>

+ Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em>. See

+ <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section..

+</p>

+</dd>

+</dl></div>

+</div>

+<div class="sect1">

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

-<pre><code><strong><span class="white">$ git map-branches</span></strong>

-<strong><span class="red">origin/master *</span></strong>

- <span class="green">cool_feature</span>

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

-<strong><span class="white">$ git nav-downstream</span></strong>

-Please select a downstream branch

- 0. cool_feature

- 1. frozen_changes

- 2. master

-Selection (0-2)[0]: 0

-<strong><span class="white">$ git map-branches</span></strong>

-<span class="red">origin/master</span>

- <strong><span class="aqua">cool_feature *</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 class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a>, <a href="git-nav-upstream.html">git-nav-upstream(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>

@@ -818,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">

-Last updated 2014-03-14 14:24:49 PDT

+Last updated 2014-03-25 15:09:11 PDT

</div>

</body>

« no previous file with comments | « docs/html/git-rename-branch.html ('k') | docs/html/git-squash-branch.html » ('j') | no next file with comments »