OLD | NEW |
1 '\" t | 1 '\" t |
2 .\" Title: git-new-branch | 2 .\" Title: git-new-branch |
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] | 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> | 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
5 .\" Date: 03/25/2014 | 5 .\" Date: 04/10/2014 |
6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
7 .\" Source: depot_tools 207bff1 | 7 .\" Source: depot_tools 68b1017 |
8 .\" Language: English | 8 .\" Language: English |
9 .\" | 9 .\" |
10 .TH "GIT\-NEW\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_to
ols Manual" | 10 .TH "GIT\-NEW\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_to
ols Manual" |
11 .\" ----------------------------------------------------------------- | 11 .\" ----------------------------------------------------------------- |
12 .\" * Define some portability stuff | 12 .\" * Define some portability stuff |
13 .\" ----------------------------------------------------------------- | 13 .\" ----------------------------------------------------------------- |
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
15 .\" http://bugs.debian.org/507673 | 15 .\" http://bugs.debian.org/507673 |
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html | 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html |
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
18 .ie \n(.g .ds Aq \(aq | 18 .ie \n(.g .ds Aq \(aq |
19 .el .ds Aq ' | 19 .el .ds Aq ' |
20 .\" ----------------------------------------------------------------- | 20 .\" ----------------------------------------------------------------- |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 <branch_name> | 64 <branch_name> |
65 .RS 4 | 65 .RS 4 |
66 The name for the new branch\&. | 66 The name for the new branch\&. |
67 .RE | 67 .RE |
68 .SH "CONFIGURATION VARIABLES" | 68 .SH "CONFIGURATION VARIABLES" |
69 .SS "depot\-tools\&.upstream" | 69 .SS "depot\-tools\&.upstream" |
70 .sp | 70 .sp |
71 This configures the default \fIupstream\fR for all new branches\&. If it is unse
t, it defaults to \fIorigin/master\fR\&. This is considered to be the \fIroot\fR
branch\&. | 71 This configures the default \fIupstream\fR for all new branches\&. If it is unse
t, it defaults to \fIorigin/master\fR\&. This is considered to be the \fIroot\fR
branch\&. |
72 .SH "EXAMPLE" | 72 .SH "EXAMPLE" |
73 .sp | 73 .sp |
| 74 |
| 75 .sp |
74 .if n \{\ | 76 .if n \{\ |
75 .RS 4 | 77 .RS 4 |
76 .\} | 78 .\} |
77 .nf | 79 .nf |
78 \fB$ git map\-branches\fR | 80 \fB$ git map\-branches\fR |
79 origin/master | 81 origin/master |
80 cool_feature | 82 cool_feature |
81 subfeature | 83 subfeature |
82 frozen_changes * | 84 fixit |
83 \fB$ git new\-branch independent_cl\fR | 85 \fB frozen_branch * |
| 86 $ git new\-branch independent_cl\fR |
| 87 \fB$ git map\-branches\fR |
| 88 \fBorigin/master |
| 89 \fR cool_feature |
| 90 subfeature |
| 91 fixit |
| 92 frozen_branch |
| 93 \fB independent_cl * |
| 94 $ git new\-branch \-\-upstream subfeature nested_cl\fR |
84 \fB$ git map\-branches\fR | 95 \fB$ git map\-branches\fR |
85 origin/master | 96 origin/master |
86 cool_feature | 97 cool_feature |
87 subfeature | 98 \fB subfeature \fR\fB\fB(1)\fR\fR\fB |
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 * | 99 nested_cl * |
96 frozen_changes | 100 \fR fixit |
| 101 frozen_branch |
97 independent_cl | 102 independent_cl |
98 \fB$ git checkout cool_feature\fR | 103 \fB$ git checkout cool_feature\fR |
| 104 Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. |
| 105 (use "git push" to publish your local commits) |
99 \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR | 106 \fB$ git new\-branch \-\-upstream_current cl_depends_on_cool_feature\fR |
100 \fB$ git map\-branches\fR | 107 \fB$ git map\-branches\fR |
101 origin/master | 108 origin/master |
102 cool_feature | 109 \fB cool_feature |
103 cl_depends_on_cool_feature * | 110 cl_depends_on_cool_feature * |
104 subfeature | 111 \fR subfeature |
105 nested_cl | 112 nested_cl |
106 frozen_changes | 113 fixit |
| 114 frozen_branch |
107 independent_cl | 115 independent_cl |
108 .fi | 116 .fi |
109 .if n \{\ | 117 .if n \{\ |
110 .RE | 118 .RE |
111 .\} | 119 .\} |
112 .sp | 120 .sp |
| 121 |
113 .sp | 122 .sp |
114 \fB1. \fRNote that both branches are cyan because they are currently the same | 123 .RS 4 |
| 124 .ie n \{\ |
| 125 \h'-04' 1.\h'+01'\c |
| 126 .\} |
| 127 .el \{\ |
| 128 .sp -1 |
| 129 .IP " 1." 4.2 |
| 130 .\} |
| 131 Note that both branches are cyan because they are currently the same |
115 \fIcommit\fR | 132 \fIcommit\fR |
116 object\&. See | 133 object\&. See |
117 \fB:git-map-branches\fR(1) | 134 \fBgit-map-branches\fR(1) |
118 for more detail\&. | 135 for more detail\&. |
119 .br | 136 .RE |
120 .SH "SUGGESTED ALIASES" | 137 .SH "SUGGESTED ALIASES" |
121 .sp | 138 .sp |
122 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. | 139 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. |
123 .sp | 140 .sp |
124 .if n \{\ | 141 .if n \{\ |
125 .RS 4 | 142 .RS 4 |
126 .\} | 143 .\} |
127 .nf | 144 .nf |
128 [alias] | 145 [alias] |
129 git nb = new\-branch | 146 git nb = new\-branch |
130 git tb = new\-branch \-\-upstream_current \fB(1)\fR | 147 git tb = new\-branch \-\-upstream_current \fB(1)\fR |
131 .fi | 148 .fi |
132 .if n \{\ | 149 .if n \{\ |
133 .RE | 150 .RE |
134 .\} | 151 .\} |
135 .sp | 152 .sp |
136 .sp | 153 .sp |
137 \fB1. \fRmnemonic: tb \(-> "track branch" | 154 \fB1. \fRmnemonic: tb \(-> "track branch" |
138 .br | 155 .br |
139 .SH "SEE ALSO" | 156 .SH "SEE ALSO" |
140 .sp | 157 .sp |
141 \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-rename-branch\f
R(1), \fBgit-upstream-diff\fR(1) | 158 \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" | 159 .SH "CHROMIUM DEPOT_TOOLS" |
143 .sp | 160 .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\&. | 161 Part of the chromium \fBdepot_tools\fR(7) 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" | 162 .SH "NOTES" |
146 .IP " 1." 4 | 163 .IP " 1." 4 |
147 here | 164 here |
148 .RS 4 | 165 .RS 4 |
149 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 166 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
150 .RE | 167 .RE |
OLD | NEW |