OLD | NEW |
1 '\" t | 1 '\" t |
2 .\" Title: git-drover | 2 .\" Title: git-drover |
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: 10/20/2015 | 5 .\" Date: 07/21/2016 |
6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
7 .\" Source: depot_tools 704d890 | 7 .\" Source: depot_tools bf2a341 |
8 .\" Language: English | 8 .\" Language: English |
9 .\" | 9 .\" |
10 .TH "GIT\-DROVER" "1" "10/20/2015" "depot_tools 704d890" "Chromium depot_tools M
anual" | 10 .TH "GIT\-DROVER" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools M
anual" |
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 .RS 4 | 94 .RS 4 |
95 .sp | 95 .sp |
96 | 96 |
97 .sp | 97 .sp |
98 .if n \{\ | 98 .if n \{\ |
99 .RS 4 | 99 .RS 4 |
100 .\} | 100 .\} |
101 .nf | 101 .nf |
102 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&
. | 102 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&
. |
103 \fB$ git log \-n 1 \-\-pretty=fuller\fR | 103 \fB$ git log \-n 1 \-\-pretty=fuller\fR |
104 commit 9b111fcda69cb6bf8a38d1e77867c298d80ca9d1 | 104 commit 26e52487417bedec18e38b4937c721769275ac89 |
105 Author: some\&.committer <some\&.committer@chromium\&.org> | 105 Author: some\&.committer <some\&.committer@chromium\&.org> |
106 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 | 106 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
107 Commit: some\&.committer <some\&.committer@chromium\&.org> | 107 Commit: some\&.committer <some\&.committer@chromium\&.org> |
108 CommitDate: Thu Apr 10 08:54:46 2014 +0000 | 108 CommitDate: Thu Apr 10 08:54:46 2014 +0000 |
109 | 109 |
110 This change needs to go to branch 9999 | 110 This change needs to go to branch 9999 |
111 | 111 |
112 # Now do the \*(Aqdrover\*(Aq\&. | 112 # Now do the \*(Aqdrover\*(Aq\&. |
113 \fB$ git drover \-\-branch 9999 \-\-cherry\-pick 9b111fcda69cb6bf8a38d1e77867c29
8d80ca9d1\fR | 113 \fB$ git drover \-\-branch 9999 \-\-cherry\-pick 26e52487417bedec18e38b4937c7217
69275ac89\fR |
114 Going to cherry\-pick | 114 Going to cherry\-pick |
115 """ | 115 """ |
116 commit 9b111fcda69cb6bf8a38d1e77867c298d80ca9d1 | 116 commit 26e52487417bedec18e38b4937c721769275ac89 |
117 Author: some\&.committer <some\&.committer@chromium\&.org> | 117 Author: some\&.committer <some\&.committer@chromium\&.org> |
118 Date: Thu Apr 10 08:54:46 2014 +0000 | 118 Date: Thu Apr 10 08:54:46 2014 +0000 |
119 | 119 |
120 This change needs to go to branch 9999 | 120 This change needs to go to branch 9999 |
121 """ | 121 """ |
122 to 9999\&. Continue (y/n)? y | 122 to 9999\&. Continue (y/n)? y |
123 | 123 |
124 # A cl is uploaded to rietveld, where it can be reviewed before landing\&. | 124 # A cl is uploaded to rietveld, where it can be reviewed before landing\&. |
125 | 125 |
126 About to land on 9999\&. Continue (y/n)? y | 126 About to land on 9999\&. Continue (y/n)? y |
(...skipping 14 matching lines...) Expand all Loading... |
141 .RS 4 | 141 .RS 4 |
142 .sp | 142 .sp |
143 | 143 |
144 .sp | 144 .sp |
145 .if n \{\ | 145 .if n \{\ |
146 .RS 4 | 146 .RS 4 |
147 .\} | 147 .\} |
148 .nf | 148 .nf |
149 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&
. | 149 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&
. |
150 \fB$ git log \-n 1 \-\-pretty=fuller\fR | 150 \fB$ git log \-n 1 \-\-pretty=fuller\fR |
151 commit 89ce5bb7bdf7149754b94e4d9fc5413435e6680d | 151 commit 0a1d0509ed8d7c486107d7288287b3c05b97a916 |
152 Author: some\&.committer <some\&.committer@chromium\&.org> | 152 Author: some\&.committer <some\&.committer@chromium\&.org> |
153 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 | 153 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
154 Commit: some\&.committer <some\&.committer@chromium\&.org> | 154 Commit: some\&.committer <some\&.committer@chromium\&.org> |
155 CommitDate: Thu Apr 10 08:54:46 2014 +0000 | 155 CommitDate: Thu Apr 10 08:54:46 2014 +0000 |
156 | 156 |
157 This change needs to go to branch 9999 | 157 This change needs to go to branch 9999 |
158 | 158 |
159 # Now do the \*(Aqdrover\*(Aq\&. | 159 # Now do the \*(Aqdrover\*(Aq\&. |
160 \fB$ git drover \-\-branch 9999 \-\-cherry\-pick 89ce5bb7bdf7149754b94e4d9fc5413
435e6680d\fR | 160 \fB$ git drover \-\-branch 9999 \-\-cherry\-pick 0a1d0509ed8d7c486107d7288287b3c
05b97a916\fR |
161 Going to cherry\-pick | 161 Going to cherry\-pick |
162 """ | 162 """ |
163 commit 89ce5bb7bdf7149754b94e4d9fc5413435e6680d | 163 commit 0a1d0509ed8d7c486107d7288287b3c05b97a916 |
164 Author: some\&.committer <some\&.committer@chromium\&.org> | 164 Author: some\&.committer <some\&.committer@chromium\&.org> |
165 Date: Thu Apr 10 08:54:46 2014 +0000 | 165 Date: Thu Apr 10 08:54:46 2014 +0000 |
166 | 166 |
167 This change needs to go to branch 9999 | 167 This change needs to go to branch 9999 |
168 """ | 168 """ |
169 to 9999\&. Continue (y/n)? y | 169 to 9999\&. Continue (y/n)? y |
170 | 170 |
171 Error: Patch failed to apply\&. | 171 Error: Patch failed to apply\&. |
172 | 172 |
173 A workdir for this cherry\-pick has been created in | 173 A workdir for this cherry\-pick has been created in |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 .nf | 212 .nf |
213 # Make sure we have the most up\-to\-date branch sources\&. | 213 # Make sure we have the most up\-to\-date branch sources\&. |
214 \fB$ git fetch\fR | 214 \fB$ git fetch\fR |
215 | 215 |
216 # Checkout the branch with the change we want to revert\&. | 216 # Checkout the branch with the change we want to revert\&. |
217 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR | 217 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR |
218 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. | 218 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. |
219 | 219 |
220 # Here\*(Aqs the commit we want to revert\&. | 220 # Here\*(Aqs the commit we want to revert\&. |
221 \fB$ git log \-n 1\fR | 221 \fB$ git log \-n 1\fR |
222 commit d5efb50dcc76ea29ad30d1015fb291a9ba5fc0db | 222 commit 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0 |
223 Author: some\&.committer <some\&.committer@chromium\&.org> | 223 Author: some\&.committer <some\&.committer@chromium\&.org> |
224 Date: Thu Apr 10 08:54:46 2014 +0000 | 224 Date: Thu Apr 10 08:54:46 2014 +0000 |
225 | 225 |
226 This change is horribly broken\&. | 226 This change is horribly broken\&. |
227 | 227 |
228 # Now do the revert\&. | 228 # Now do the revert\&. |
229 \fB$ git revert d5efb50dcc76ea29ad30d1015fb291a9ba5fc0db\fR | 229 \fB$ git revert 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0\fR |
230 | 230 |
231 # That reverted the change and committed the revert\&. | 231 # That reverted the change and committed the revert\&. |
232 \fB$ git log \-n 1\fR | 232 \fB$ git log \-n 1\fR |
233 commit 1b6ccf84e2c13c6f6a2b69b29626aed8fa0ae24d | 233 commit 84f214d895434bee2ab9aa08562f71a25891a31d |
234 Author: you <you@chromium\&.org> | 234 Author: you <you@chromium\&.org> |
235 Date: Thu Apr 10 09:11:36 2014 +0000 | 235 Date: Thu Apr 10 09:11:36 2014 +0000 |
236 | 236 |
237 Revert "This change is horribly broken\&." | 237 Revert "This change is horribly broken\&." |
238 | 238 |
239 This reverts commit d5efb50dcc76ea29ad30d1015fb291a9ba5fc0db\&. | 239 This reverts commit 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0\&. |
240 | 240 |
241 # As with old drover, reverts are generally OK to commit without LGTM\&. | 241 # As with old drover, reverts are generally OK to commit without LGTM\&. |
242 \fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR | 242 \fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR |
243 \fB$ git cl land \-\-bypass\-hooks\fR | 243 \fB$ git cl land \-\-bypass\-hooks\fR |
| 244 Using 50% similarity for rename/copy detection\&. Override with \-\-similarity\&
. |
244 .fi | 245 .fi |
245 .if n \{\ | 246 .if n \{\ |
246 .RE | 247 .RE |
247 .\} | 248 .\} |
248 .sp | 249 .sp |
249 .RE | 250 .RE |
250 .sp | 251 .sp |
251 .it 1 an-trap | 252 .it 1 an-trap |
252 .nr an-no-space-flag 1 | 253 .nr an-no-space-flag 1 |
253 .nr an-break-flag 1 | 254 .nr an-break-flag 1 |
254 .br | 255 .br |
255 .ps +1 | 256 .ps +1 |
256 \fBManual Merge Example\fR | 257 \fBManual Merge Example\fR |
257 .RS 4 | 258 .RS 4 |
258 .sp | 259 .sp |
259 | 260 |
260 .sp | 261 .sp |
261 .if n \{\ | 262 .if n \{\ |
262 .RS 4 | 263 .RS 4 |
263 .\} | 264 .\} |
264 .nf | 265 .nf |
265 # Make sure we have the most up\-to\-date branch sources\&. | 266 # Make sure we have the most up\-to\-date branch sources\&. |
266 \fB$ git fetch\fR | 267 \fB$ git fetch\fR |
267 | 268 |
268 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&
. | 269 # Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&
. |
269 \fB$ git log \-n 1 \-\-pretty=fuller\fR | 270 \fB$ git log \-n 1 \-\-pretty=fuller\fR |
270 commit 2655f8d9d48f18dbfed237c67b8c65134050b2e3 | 271 commit aecb0b589f95d2efd6a32294cc6e6afb085f6b87 |
271 Author: some\&.committer <some\&.committer@chromium\&.org> | 272 Author: some\&.committer <some\&.committer@chromium\&.org> |
272 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 | 273 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
273 Commit: some\&.committer <some\&.committer@chromium\&.org> | 274 Commit: some\&.committer <some\&.committer@chromium\&.org> |
274 CommitDate: Thu Apr 10 08:54:46 2014 +0000 | 275 CommitDate: Thu Apr 10 08:54:46 2014 +0000 |
275 | 276 |
276 This change needs to go to branch 9999 | 277 This change needs to go to branch 9999 |
277 | 278 |
278 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&. | 279 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&. |
279 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR | 280 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR |
280 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. | 281 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. |
281 | 282 |
282 # Now do the \*(Aqdrover\*(Aq\&. | 283 # Now do the \*(Aqdrover\*(Aq\&. |
283 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag | 284 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag |
284 \fB$ git cherry\-pick \-x 2655f8d9d48f18dbfed237c67b8c65134050b2e3\fR | 285 \fB$ git cherry\-pick \-x aecb0b589f95d2efd6a32294cc6e6afb085f6b87\fR |
285 [drover_9999 589e8ad] This change needs to go to branch 9999 | 286 [drover_9999 3f113b7] This change needs to go to branch 9999 |
286 Author: some\&.committer <some\&.committer@chromium\&.org> | 287 Author: some\&.committer <some\&.committer@chromium\&.org> |
287 Date: Thu Apr 10 08:54:46 2014 +0000 | 288 Date: Thu Apr 10 08:54:46 2014 +0000 |
288 1 file changed, 1 insertion(+) | 289 1 file changed, 1 insertion(+) |
289 create mode 100644 modified_file | 290 create mode 100644 modified_file |
290 | 291 |
291 # That took the code authored by some\&.committer and committed it to | 292 # That took the code authored by some\&.committer and committed it to |
292 # the branch by the person who drovered it (i\&.e\&. you)\&. | 293 # the branch by the person who drovered it (i\&.e\&. you)\&. |
293 \fB$ git log \-n 1 \-\-pretty=fuller\fR | 294 \fB$ git log \-n 1 \-\-pretty=fuller\fR |
294 commit 589e8adbb095944100d029724b4038094120f23b | 295 commit 3f113b79d87aadfbbc6d4ff8de038c69c94dc9b2 |
295 Author: some\&.committer <some\&.committer@chromium\&.org> | 296 Author: some\&.committer <some\&.committer@chromium\&.org> |
296 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 | 297 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
297 Commit: you <you@chromium\&.org> | 298 Commit: you <you@chromium\&.org> |
298 CommitDate: Thu Apr 10 09:11:36 2014 +0000 | 299 CommitDate: Thu Apr 10 09:11:36 2014 +0000 |
299 | 300 |
300 This change needs to go to branch 9999 | 301 This change needs to go to branch 9999 |
301 | 302 |
302 (cherry picked from commit 2655f8d9d48f18dbfed237c67b8c65134050b2e3) | 303 (cherry picked from commit aecb0b589f95d2efd6a32294cc6e6afb085f6b87) |
303 | 304 |
304 # Looks good\&. Ship it! | 305 # Looks good\&. Ship it! |
305 \fB$ git cl upload\fR | 306 \fB$ git cl upload\fR |
306 # Wait for LGTM or TBR it\&. | 307 # Wait for LGTM or TBR it\&. |
307 \fB$ git cl land\fR | 308 \fB$ git cl land\fR |
| 309 Using 50% similarity for rename/copy detection\&. Override with \-\-similarity\&
. |
308 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq | 310 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq |
309 .fi | 311 .fi |
310 .if n \{\ | 312 .if n \{\ |
311 .RE | 313 .RE |
312 .\} | 314 .\} |
313 .sp | 315 .sp |
314 .RE | 316 .RE |
315 .SH "SEE ALSO" | 317 .SH "SEE ALSO" |
316 .sp | 318 .sp |
317 \fBgit-cherry-pick\fR(1), \fBgit-revert\fR(1) | 319 \fBgit-cherry-pick\fR(1), \fBgit-revert\fR(1) |
318 .SH "CHROMIUM DEPOT_TOOLS" | 320 .SH "CHROMIUM DEPOT_TOOLS" |
319 .sp | 321 .sp |
320 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\&. | 322 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\&. |
321 .SH "NOTES" | 323 .SH "NOTES" |
322 .IP " 1." 4 | 324 .IP " 1." 4 |
323 here | 325 here |
324 .RS 4 | 326 .RS 4 |
325 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 327 \%https://chromium.googlesource.com/chromium/tools/depot_tools |
326 .RE | 328 .RE |
OLD | NEW |