| OLD | NEW |
|---|
| (Empty) | |
| 1 '\" t |
| 2 .\" Title: git-new-branch |
| 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
| 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
| 5 .\" Date: 03/23/2014 |
| 6 .\" Manual: Chromium depot_tools Manual |
| 7 .\" Source: depot_tools 936565b |
| 8 .\" Language: English |
| 9 .\" |
| 10 .TH "GIT\-NEW\-BRANCH" "1" "03/23/2014" "depot_tools 936565b" "Chromium depot_to
ols Manual" |
| 11 .\" ----------------------------------------------------------------- |
| 12 .\" * Define some portability stuff |
| 13 .\" ----------------------------------------------------------------- |
| 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 15 .\" http://bugs.debian.org/507673 |
| 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html |
| 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 18 .ie \n(.g .ds Aq \(aq |
| 19 .el .ds Aq ' |
| 20 .\" ----------------------------------------------------------------- |
| 21 .\" * set default formatting |
| 22 .\" ----------------------------------------------------------------- |
| 23 .\" disable hyphenation |
| 24 .nh |
| 25 .\" disable justification (adjust text to left margin only) |
| 26 .ad l |
| 27 .\" ----------------------------------------------------------------- |
| 28 .\" * MAIN CONTENT STARTS HERE * |
| 29 .\" ----------------------------------------------------------------- |
| 30 .SH "NAME" |
| 31 git-new-branch \- Create a new branch with correct tracking information\&. |
| 32 .SH "SYNOPSIS" |
| 33 .sp |
| 34 .nf |
| 35 \fIgit new\-branch\fR <branch_name> |
| 36 \fIgit new\-branch\fR \-\-upstream_current <branch_name> |
| 37 \fIgit new\-branch\fR \-\-upstream <REF> <branch_name> |
| 38 \fIgit new\-branch\fR \-\-lkgr <branch_name> |
| 39 .fi |
| 40 .sp |
| 41 .SH "DESCRIPTION" |
| 42 .sp |
| 43 Creates a new branch\&. By default the new branch will track the configured upst
ream for the repo (defaults to \fIorigin/master\fR)\&. If one of the other optio
ns is specified, it will track that other ref instead\&. |
| 44 .sp |
| 45 Conceptually, each branch in your repo represents one \fIChange List (CL)\fR\&.
If you have many independent CLs (i\&.e\&. the changes in one do not interact wi
th/depend on the changes in another), then you should create them as new branche
s tracking the default upstream (i\&.e\&. git new\-branch <branch_name>)\&. If y
ou have features which depend on each other, you should create stacked branches
using git new\-branch \-\-upstream_current <branch_name>\&. |
| 46 .SH "OPTIONS" |
| 47 .PP |
| 48 \-\-upstream_current |
| 49 .RS 4 |
| 50 Set the tracking (upstream) branch to the currently\-checked\-out branch\&. |
| 51 .RE |
| 52 .PP |
| 53 \-\-uptstream <REF> |
| 54 .RS 4 |
| 55 Set the tracking (upstream) branch to <REF>\&. <REF> may be a local branch, remo
te branch, or a tag\&. |
| 56 .RE |
| 57 .PP |
| 58 \-\-lkgr |
| 59 .RS 4 |
| 60 Alias for |
| 61 \-\-upstream lkgr\&. |
| 62 .RE |
| 63 .PP |
| 64 <branch_name> |
| 65 .RS 4 |
| 66 The name for the new branch\&. |
| 67 .RE |
| 68 .SH "CONFIGURATION VARIABLES" |
| 69 .SS "depot\-tools\&.upstream" |
| 70 .sp |
| 71 This configures the default \fIupstream\fR for all new branches\&. If it is unse
t, it defaults to \fIorigin/master\fR\&. |
| 72 .SH "EXAMPLE" |
| 73 .sp |
| 74 .if n \{\ |
| 75 .RS 4 |
| 76 .\} |
| 77 .nf |
| 78 \fB$ git map\-branches\fR |
| 79 origin/master |
| 80 cool_feature |
| 81 subfeature |
| 82 frozen_changes * |
| 83 \fB$ git new\-branch independent_cl\fR |
| 84 \fB$ git map\-branches\fR |
| 85 origin/master |
| 86 cool_feature |
| 87 subfeature |
| 88 frozen_changes |
| 89 independent_cl * |
| 90 \fB$ git new\-branch \-\-upstream subfeature nested_cl\fR |
| 91 \fB$ git map\-branches\fR |
| 92 origin/master |
| 93 cool_feature |
| 94 subfeature \fB(1)\fR |
| 95 nested_cl * |
| 96 frozen_changes |
| 97 independent_cl |
| 98 \fB$ git checkout cool_feature\fR |
| 99 \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR |
| 100 \fB$ git map\-branches\fR |
| 101 origin/master |
| 102 cool_feature |
| 103 cl_depends_on_cool_feature * |
| 104 subfeature |
| 105 nested_cl |
| 106 frozen_changes |
| 107 independent_cl |
| 108 .fi |
| 109 .if n \{\ |
| 110 .RE |
| 111 .\} |
| 112 .sp |
| 113 .sp |
| 114 \fB1. \fRNote that both branches are cyan because they are currently the same |
| 115 \fIcommit\fR |
| 116 object\&. See |
| 117 \fB:git-map-branches\fR(1) |
| 118 for more detail\&. |
| 119 .br |
| 120 .SH "SUGGESTED ALIASES" |
| 121 .sp |
| 122 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. |
| 123 .sp |
| 124 .if n \{\ |
| 125 .RS 4 |
| 126 .\} |
| 127 .nf |
| 128 [alias] |
| 129 git nb = new\-branch |
| 130 git tb = new\-branch \-\-upstream_current \fB(1)\fR |
| 131 .fi |
| 132 .if n \{\ |
| 133 .RE |
| 134 .\} |
| 135 .sp |
| 136 .sp |
| 137 \fB1. \fRmnemonic: tb \(-> "track branch" |
| 138 .br |
| 139 .SH "SEE ALSO" |
| 140 .sp |
| 141 \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\f
R(1), \fBgit-upstream-diff\fR(1) |
| 142 .SH "CHROMIUM DEPOT_TOOLS" |
| 143 .sp |
| 144 Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assi
st with the development of chromium and related projects\&. Download the tools f
rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |
| 145 .SH "NOTES" |
| 146 .IP " 1." 4 |
| 147 here |
| 148 .RS 4 |
| 149 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
| 150 .RE |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 184253003:
Add git-reup and friends (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw