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

Unified Diff: docs/html/git-new-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

Index: docs/html/git-new-branch.html

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

similarity index 79%

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

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

index da5b5093860a013bb360b469da7beea882b2c417..2337ba905e6cf6a259deadea0581f5be6c511f88 100644

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

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

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

<head>

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

+<title>git-new-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-new-branch(1) Manual Page

</h1>

-<p>git-nav-downstream -

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

+<p>git-new-branch -

+ Create a new branch with correct tracking information.

</p>

</div>

@@ -755,7 +755,10 @@ 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 new-branch</em> <branch_name>

+<em>git new-branch</em> --upstream_current <branch_name>

+<em>git new-branch</em> --upstream <REF> <branch_name>

+<em>git new-branch</em> --lkgr <branch_name></pre>

</div></div>

</div>

@@ -763,10 +766,65 @@ 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>Creates a new branch. By default the new branch will track the configured

+upstream for the repo (defaults to <em>origin/master</em>). If one of the other options

+is specified, it will track that other ref instead.</p></div>

+<div class="paragraph"><p>Conceptually, each branch in your repo represents one <em>Change List (CL)</em>. If you

+have many independent CLs (i.e. the changes in one do not interact with/depend

+on the changes in another), then you should create them as new branches tracking

+the default upstream (i.e. <code>git new-branch <branch_name></code>). If you have features

+which depend on each other, you should create stacked branches using <code>git

+new-branch --upstream_current <branch_name></code>.</p></div>

+</div>

+<div class="sect1">

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

+<div class="sectionbody">

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

+<dt class="hdlist1">

+--upstream_current

+</dt>

+<dd>

+<p>

+ Set the tracking (upstream) branch to the currently-checked-out branch.

+</p>

+</dd>

+<dt class="hdlist1">

+--uptstream <REF>

+</dt>

+<dd>

+<p>

+ Set the tracking (upstream) branch to <REF>. <REF> may be a local branch,

+ remote branch, or a tag.

+</p>

+</dd>

+<dt class="hdlist1">

+--lkgr

+</dt>

+<dd>

+<p>

+ Alias for <code>--upstream lkgr</code>.

+</p>

+</dd>

+<dt class="hdlist1">

+<branch_name>

+</dt>

+<dd>

+<p>

+ The name for the new branch.

+</p>

+</dd>

+</dl></div>

+</div>

+<div class="sect1">

+<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>

+<div class="sectionbody">

+<div class="sect2">

+<h3 id="_depot_tools_upstream">depot-tools.upstream</h3>

+<div class="paragraph"><p>This configures the default <em>upstream</em> for all new branches. If it is unset, it

+defaults to <em>origin/master</em>.</p></div>

+</div>

</div>

@@ -775,35 +833,71 @@ command will prompt you with a selection of the branches.</p></div>

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

-<strong><span class="red">origin/master *</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">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

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

- <strong><span class="aqua">cool_feature *</span></strong>

+ <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">master</span>

-<span class="fuchsia">{NO UPSTREAM}</span>

- <span class="green">bogus_noparent</span></code></pre>

+ <span class="green">independent_cl</span></code></pre>

</div></div>

+<div class="colist arabic"><ol>

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

+</p>

+</li>

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

+<div class="listingblock">

+<div class="content">

+<pre><code>[alias]

+ git nb = new-branch

+ git tb = new-branch --upstream_current <b><1></b></code></pre>

+</div></div>

+<div class="colist arabic"><ol>

+<li>

+<p>

+mnemonic: tb → "track branch"

+</p>

+</li>

+</ol></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-reparent-branch.html">git-reparent-branch(1)</a>,

+<a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>

</div>

@@ -818,7 +912,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-23 02:13:18 PDT

</div>

</body>

« docs/html/git-freeze.html ('K') | « docs/html/git-nav-upstream.html ('k') | docs/html/git-rebase-update.html » ('j') | docs/src/git-new-branch.txt » ('J')